Fix: check for rand_r() in compat-rand.h

The rand_r() function exists in newer Android versions,
detect it instead of relying on the __ANDROID__ define.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index 6a481e368e9f31a802d0c1507b50a98573964bf1..cd5a05a426a63cc1a4873b5f632e67e577f0e3ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,7 @@ AC_CHECK_FUNCS([ \
        memeset \
        memset \
        munmap \
+       rand_r \
        sched_getcpu \
        strerror \
        strtoul \

diff --git a/src/compat-rand.h b/src/compat-rand.h
index 7c6acde32f00808dbc15904ad4d775444294153d..835d99b8abd39af5a18bcbabcdf5d8aec1a6a664 100644 (file)
--- a/src/compat-rand.h
+++ b/src/compat-rand.h
@@ -28,7 +28,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifdef __ANDROID__
+#ifndef HAVE_RAND_R
 /*
  * Reentrant random function from POSIX.1c.
  * Copyright (C) 1996, 1999 Free Software Foundation, Inc.
@@ -58,6 +58,6 @@ static inline int rand_r(unsigned int *seed)
 
        return result;
 }
-#endif /* __ANDROID__ */
+#endif /* HAVE_RAND_R */
 
 #endif /* _COMPAT_RAND_H */