# HG changeset patch
# User Kevin Cernekee <cernekee@google.com>
# Date 1423696977 28800
# Node ID 805a8eab2969157f3b054b593e6c49ac67aad23f
# Parent  1442f927aea4ef5b49aaf5b15de7f1ee612eb9ea
signal_h: Fix Android build

* lib/signal.in.h: Add Android to the list of platforms that declare
pthread_sigmask() in <pthread.h> instead of <signal.h>.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,10 @@
 	* m4/net_if_h.m4: Check to make sure <net/if.h> actually defines
 	struct if_nameindex.  If not, enable the replacement header.
 
+	signal_h: Fix Android build
+	* lib/signal.in.h: Add Android to the list of platforms that declare
+	pthread_sigmask() in <pthread.h> instead of <signal.h>.
+
 2015-02-08  Daiki Ueno  <ueno@gnu.org>
 
 	uniname/unimame-tests: don't link with -lunistring
diff --git a/lib/signal.in.h b/lib/signal.in.h
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -55,11 +55,13 @@
 #ifndef _@GUARD_PREFIX@_SIGNAL_H
 #define _@GUARD_PREFIX@_SIGNAL_H
 
-/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare
-   pthread_sigmask in <pthread.h>, not in <signal.h>.
+/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android
+   declare pthread_sigmask in <pthread.h>, not in <signal.h>.
    But avoid namespace pollution on glibc systems.*/
 #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
-    && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \
+    && ((defined __APPLE__ && defined __MACH__) \
+        || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \
+        || defined __sun || defined __ANDROID__) \
     && ! defined __GLIBC__
 # include <pthread.h>
 #endif