From 094c8c59183be7b084e4faf061dc23faab1f13b1 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 23 Jun 2016 14:28:22 -0400
Subject: [PATCH] Fix: Move rand-compat to private src dir

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/Makefile.am                             | 1 -
 include/urcu/static/urcu.h                      | 1 -
 src/Makefile.am                                 | 3 ++-
 include/urcu/rand-compat.h => src/compat-rand.h | 8 ++++----
 tests/benchmark/test_urcu_hash.h                | 2 +-
 tests/common/debug-yield.h                      | 2 ++
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename include/urcu/rand-compat.h => src/compat-rand.h (94%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 61301c2..2792f99 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -7,7 +7,6 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
 		urcu/lfstack.h urcu/syscall-compat.h \
 		$(top_srcdir)/include/urcu/map/*.h \
 		$(top_srcdir)/include/urcu/static/*.h \
-		urcu/rand-compat.h \
 		urcu/tls-compat.h urcu/debug.h
 
 # Don't distribute generated headers
diff --git a/include/urcu/static/urcu.h b/include/urcu/static/urcu.h
index 9082af7..7048f99 100644
--- a/include/urcu/static/urcu.h
+++ b/include/urcu/static/urcu.h
@@ -41,7 +41,6 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
 #include <urcu/debug.h>
 
 #ifdef __cplusplus
diff --git a/src/Makefile.am b/src/Makefile.am
index e7eb2bc..6a2fd7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@ AM_CFLAGS=-Wall
 include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
 		urcu-pointer.h urcu-qsbr.h urcu-flavor.h
 
-dist_noinst_HEADERS = urcu-die.h urcu-wait.h compat-getcpu.h
+dist_noinst_HEADERS = urcu-die.h urcu-wait.h compat-getcpu.h \
+	compat-rand.h
 
 
 if COMPAT_ARCH
diff --git a/include/urcu/rand-compat.h b/src/compat-rand.h
similarity index 94%
rename from include/urcu/rand-compat.h
rename to src/compat-rand.h
index 2c57751..7c6acde 100644
--- a/include/urcu/rand-compat.h
+++ b/src/compat-rand.h
@@ -1,8 +1,8 @@
-#ifndef _URCU_RAND_COMPAT_H
-#define _URCU_RAND_COMPAT_H
+#ifndef _COMPAT_RAND_H
+#define _COMPAT_RAND_H
 
 /*
- * urcu/rand-compat.h
+ * compat-rand.h
  *
  * Userspace RCU library - rand/rand_r Compatibility Header
  *
@@ -60,4 +60,4 @@ static inline int rand_r(unsigned int *seed)
 }
 #endif /* __ANDROID__ */
 
-#endif /* _URCU_RAND_COMPAT_H */
+#endif /* _COMPAT_RAND_H */
diff --git a/tests/benchmark/test_urcu_hash.h b/tests/benchmark/test_urcu_hash.h
index f2e23f2..2f708a1 100644
--- a/tests/benchmark/test_urcu_hash.h
+++ b/tests/benchmark/test_urcu_hash.h
@@ -36,7 +36,7 @@
 #include <signal.h>
 
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
+#include <compat-rand.h>
 #include "cpuset.h"
 #include "thread-id.h"
 #include "../common/debug-yield.h"
diff --git a/tests/common/debug-yield.h b/tests/common/debug-yield.h
index c60e4e0..b48561c 100644
--- a/tests/common/debug-yield.h
+++ b/tests/common/debug-yield.h
@@ -31,6 +31,8 @@
 #include <pthread.h>
 #include <unistd.h>
 
+#include <compat-rand.h>
+
 #define RCU_YIELD_READ 	(1 << 0)
 #define RCU_YIELD_WRITE	(1 << 1)
 
-- 
2.34.1