From 3403cb7dd4ce1e36802f448ecba2bccc6706e73e Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 4 Mar 2018 01:28:55 +0100
Subject: [PATCH] hurd: avoid including hurd/signal.h when not needed

thus making <hurd/port.h> and <hurd/userlink.h> includable without
_GNU_SOURCE.

	* hurd/hurd/port.h: Do not include <hurd/signal.h>.
	* hurd/hurd/userlink.h [!defined __USE_EXTERN_INLINES ||
	!defined _LIBC || !IS_IN (libc)]: Do not include <hurd/signal.h>.
---
 ChangeLog            | 3 +++
 hurd/hurd/port.h     | 1 -
 hurd/hurd/userlink.h | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9bfa1bd3169..297af745e27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
 	* sysdeps/mach/i386/bits/mach/param.h: ... here.  Update path in #error.
 	* sysdeps/mach/hurd/bits/param.h: Include <bits/mach/param.h> instead
 	of <mach/param.h>.
+	* hurd/hurd/port.h: Do not include <hurd/signal.h>.
+	* hurd/hurd/userlink.h [!defined __USE_EXTERN_INLINES ||
+	!defined _LIBC || !IS_IN (libc)]: Do not include <hurd/signal.h>.
 
 2018-03-03  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h
index eec85ccc292..0779578d038 100644
--- a/hurd/hurd/port.h
+++ b/hurd/hurd/port.h
@@ -24,7 +24,6 @@
 #include <mach.h>
 #include <hurd/userlink.h>
 #include <spin-lock.h>
-#include <hurd/signal.h>
 
 
 /* Structure describing a cell containing a port.  With the lock held, a
diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h
index fb7cab27c3c..f9362557cba 100644
--- a/hurd/hurd/userlink.h
+++ b/hurd/hurd/userlink.h
@@ -24,7 +24,11 @@
 #define __need_NULL
 #include <stddef.h>
 
-#include <hurd/signal.h>
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+# if IS_IN (libc)
+#  include <hurd/signal.h>
+# endif
+#endif
 #include <setjmp.h>
 
 
-- 
2.47.2