[Glibc-bsd-commits] r5147 - trunk/kfreebsd-11/debian/patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Thu Nov 28 15:27:26 UTC 2013
Author: rmh
Date: 2013-11-20 13:44:46 +0000 (St, 20 lis 2013)
New Revision: 5147
Modified:
trunk/kfreebsd-11/debian/patches/userland.diff
Log:
Resync with kkh
Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff 2013-11-20 13:44:13 UTC (rev 5146)
+++ trunk/kfreebsd-11/debian/patches/userland.diff 2013-11-20 13:44:46 UTC (rev 5147)
@@ -1102,3 +1102,26 @@
/*
* Do not add any new variables here. (See the comment at the end of
* the file for why.)
+--- a/sys/sys/signal.h
++++ b/sys/sys/signal.h
+@@ -45,6 +45,13 @@
+ #include <machine/_limits.h> /* __MINSIGSTKSZ */
+ #include <machine/signal.h> /* sig_atomic_t; trap codes; sigcontext */
+
++/* For now just disable everything except the implicit includes.
++ TODO: We might want to enable some things below, as long as they don't
++ collide with GNU version of <sys/signal.h>. */
++#if defined(__GLIBC__) && !defined(_KERNEL)
++#include <sys/signal.h>
++#else
++
+ /*
+ * System defined signals.
+ */
+@@ -441,4 +448,6 @@
+ __sighandler_t *signal(int, __sighandler_t *);
+ __END_DECLS
+
++#endif
++
+ #endif /* !_SYS_SIGNAL_H_ */
More information about the Glibc-bsd-commits
mailing list