diff options
author | Andy Wingo <wingo@pobox.com> | 2015-10-22 13:10:30 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-10-22 13:34:00 +0000 |
commit | 2d4da30fdefbcdb065d4b1f48f2a77d06f69e3c3 (patch) | |
tree | 3f50180297054aeecd0b478e5f7260366b304c71 /lib/signal.in.h | |
parent | 139ef2d17c98488fc8e5444bf642699f2ad09e08 (diff) | |
download | guile-2d4da30fdefbcdb065d4b1f48f2a77d06f69e3c3.tar.gz |
Update Gnulib to v0.1-603-g1d16a7b
Diffstat (limited to 'lib/signal.in.h')
-rw-r--r-- | lib/signal.in.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/signal.in.h b/lib/signal.in.h index 057fa9ef5..3ea23eee5 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like <signal.h>. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -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 |