[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 10/37: Fix inclusion loop between hurd_types.defs and hurd/signal
From: |
Samuel Thibault |
Subject: |
[hurd] 10/37: Fix inclusion loop between hurd_types.defs and hurd/signal.h> |
Date: |
Mon, 09 Feb 2015 09:59:09 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to annotated tag upstream/hurd/0.5.git20150208
in repository hurd.
commit b541a7c513aafa636a8ce0903aab4b72504bc0ed
Author: Samuel Thibault <address@hidden>
Date: Thu Dec 11 18:47:09 2014 +0100
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 2d52f3f..0afdb43 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 57af6dc..4c01e63 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 09debed..4f987fa 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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 37/37: Merge remote-tracking branch 'upstream/master' into upstream, (continued)
- [hurd] 37/37: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2015/02/09
- [hurd] 24/37: libfshelp: improve error handling, Samuel Thibault, 2015/02/09
- [hurd] 18/37: console: Fix typos in comments, Samuel Thibault, 2015/02/09
- [hurd] 30/37: proc: call `startup_essential_task' earlier, Samuel Thibault, 2015/02/09
- [hurd] 34/37: Allow dhcp trafic and configuration, Samuel Thibault, 2015/02/09
- [hurd] 01/37: Makeconf: handle the task_notify protocol, Samuel Thibault, 2015/02/09
- [hurd] 02/37: proc: register for new task notifications, Samuel Thibault, 2015/02/09
- [hurd] 07/37: ext2fs: tune the size of the inode cache, Samuel Thibault, 2015/02/09
- [hurd] 26/37: libports: silence pointless error message, Samuel Thibault, 2015/02/09
- [hurd] 12/37: Avoid ./ components in mtab output, Samuel Thibault, 2015/02/09
- [hurd] 10/37: Fix inclusion loop between hurd_types.defs and hurd/signal.h>,
Samuel Thibault <=
- [hurd] 35/37: Explicit the keymap compatibility flags, Samuel Thibault, 2015/02/09
- [hurd] 03/37: proc: implement `proc_make_task_namespace', Samuel Thibault, 2015/02/09
- [hurd] 28/37: auth: simplify expression, Samuel Thibault, 2015/02/09
- [hurd] 29/37: auth: remove implicit assumption about the bootstrap process, Samuel Thibault, 2015/02/09
- [hurd] 22/37: Backport Linux changes for proper TCP EOF handling, Samuel Thibault, 2015/02/09
- [hurd] 05/37: libpager: remove the `seqno' parameters, Samuel Thibault, 2015/02/09
- [hurd] 06/37: libpager: use libports notification functions, Samuel Thibault, 2015/02/09
- [hurd] 09/37: Replace `bcopy' with `memcpy' or `memmove' as appropriate, Samuel Thibault, 2015/02/09
- [hurd] 31/37: console: fix error and notification port handling, Samuel Thibault, 2015/02/09
- [hurd] 08/37: Replace `bzero' with `memset', Samuel Thibault, 2015/02/09