diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-12-11 18:47:09 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-12-11 18:48:17 +0100 |
| commit | b541a7c513aafa636a8ce0903aab4b72504bc0ed (patch) | |
| tree | ed85c25aa787ea715525a30cd51756cd2732b7f4 | |
| parent | 82a87d043498eeacb7e4f3edc85d1b7c424ea853 (diff) | |
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>.
| -rw-r--r-- | boot/Makefile | 2 | ||||
| -rw-r--r-- | hurd/hurd_types.defs | 5 | ||||
| -rw-r--r-- | 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 |