From b541a7c513aafa636a8ce0903aab4b72504bc0ed Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 11 Dec 2014 18:47:09 +0100
Subject: Fix inclusion loop between hurd_types.defs and hurd/signal.h>

* boot/Makefile (MIGSFLAGS): Add -DHURD_DEFAULT_PAYLOAD_TO_PORT=1.
* mach-defpager/Makefile (MIGSFLAGS): Likewise.
* hurd/hurd_types.defs: Do not include <hurd/ports.h>.
---
 boot/Makefile          | 2 ++
 hurd/hurd_types.defs   | 5 ++++-
 mach-defpager/Makefile | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/boot/Makefile b/boot/Makefile
index 2d52f3ff..0afdb43b 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -37,6 +37,8 @@ include ../Makeconf
 #/usr/local/bin/uxboot: uxboot
 #	cp $< $@
 
+MIGSFLAGS = -DHURD_DEFAULT_PAYLOAD_TO_PORT=1
+
 all: boot # uxboot
 
 uxboot.o: boot.c
diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
index 57af6dc0..4c01e639 100644
--- a/hurd/hurd_types.defs
+++ b/hurd/hurd_types.defs
@@ -42,7 +42,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef HURD_DEFAULT_PAYLOAD_TO_PORT
 #endif
 #else
-   import <hurd/ports.h>;
+/* Ideally we would include this here, to make sure ports_payload_get_name gets
+   declared, but this leads to an inclusion loop via hurd/signal.h
+  import <hurd/ports.h>;
+ */
 #define HURD_DEFAULT_PAYLOAD_TO_PORT ports_payload_get_name
 #endif
 
diff --git a/mach-defpager/Makefile b/mach-defpager/Makefile
index 09debeda..4f987fae 100644
--- a/mach-defpager/Makefile
+++ b/mach-defpager/Makefile
@@ -35,4 +35,4 @@ LDFLAGS += -static
 
 include ../Makeconf
 
-MIGSFLAGS = -DSEQNOS -imacros $(srcdir)/mig-mutate.h
+MIGSFLAGS = -DSEQNOS -imacros $(srcdir)/mig-mutate.h -DHURD_DEFAULT_PAYLOAD_TO_PORT=1
-- 
cgit v1.2.3