From 92f4ac3ad2eef632c2048e8348bf4478567842d2 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Wed, 11 Feb 2015 15:22:57 -0800 Subject: [PATCH] signal_h: Fix Android build * lib/signal.in.h: Add Android to the list of platforms that declare pthread_sigmask() in instead of . --- ChangeLog | 4 ++++ lib/signal.in.h | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7edb727629..d74ae320d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,10 @@ * m4/net_if_h.m4: Check to make sure 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 instead of . + 2015-02-08 Daiki Ueno uniname/unimame-tests: don't link with -lunistring diff --git a/lib/signal.in.h b/lib/signal.in.h index 0f2ff5af84..265b72ab0e 100644 --- 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 , not in . +/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android + declare pthread_sigmask in , not in . 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 #endif -- 2.39.5