diff options
author | Andy Wingo <wingo@pobox.com> | 2016-06-29 11:14:40 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2016-06-29 11:32:05 +0200 |
commit | 2b421e02e103027851a0fa8dd1e02088948b73f8 (patch) | |
tree | 254f2883eb63eccf22cc206a06a452a26e814e9f /lib/signal.in.h | |
parent | bfca4367b074e2961618dc656dd2a14339a7ef72 (diff) | |
download | guile-2b421e02e103027851a0fa8dd1e02088948b73f8.tar.gz |
Update Gnulib to 6835fc458f30b94f15d69c35a79cbc2dfabe2d06.
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..90f7d309e 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-2016 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 |