aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--mach/Makefile2
-rw-r--r--sysdeps/mach/hurd/bits/param.h2
-rw-r--r--sysdeps/mach/i386/bits/mach/param.h (renamed from sysdeps/mach/i386/mach/param.h)2
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d8aa9c..9bfa1bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
* hurd/hurd/lookup.h: Include <hurd/hurd_types.h>
* mach/Makefile ($(objpfx)mach-shortcuts.h): Make it include
<mach/mach_types.h> and <mach/message.h>.
+ (headers): Move mach/param.h to bits/mach/param.h.
+ * sysdeps/mach/i386/mach/param.h: Move file to ...
+ * 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>.
2018-03-03 Andreas Schwab <schwab@linux-m68k.org>
diff --git a/mach/Makefile b/mach/Makefile
index d16c44f..e0d1ffb 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -21,7 +21,7 @@ include ../Makeconfig
headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \
$(interface-headers) mach/mach.h mach/mig_support.h mach/error.h \
- $(lock-headers) machine-sp.h mach/param.h
+ $(lock-headers) machine-sp.h bits/mach/param.h
lock = spin-solid spin-lock mutex-init mutex-solid
lock-headers = lock-intern.h machine-lock.h spin-lock.h
routines = $(mach-syscalls) $(mach-shortcuts) \
diff --git a/sysdeps/mach/hurd/bits/param.h b/sysdeps/mach/hurd/bits/param.h
index 7d53571..5d4faf7 100644
--- a/sysdeps/mach/hurd/bits/param.h
+++ b/sysdeps/mach/hurd/bits/param.h
@@ -20,7 +20,7 @@
# error "Never use <bits/param.h> directly; include <sys/param.h> instead."
#endif
-#include <mach/param.h>
+#include <bits/mach/param.h>
/* This file is deprecated and is provided only for compatibility with
Unix systems. It is unwise to include this file on programs which
diff --git a/sysdeps/mach/i386/mach/param.h b/sysdeps/mach/i386/bits/mach/param.h
index 20329ff..15e842f 100644
--- a/sysdeps/mach/i386/mach/param.h
+++ b/sysdeps/mach/i386/bits/mach/param.h
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
#ifndef _SYS_PARAM_H
-# error "Never use <mach/param.h> directly; include <sys/param.h> instead."
+# error "Never use <bits/mach/param.h> directly; include <sys/param.h> instead."
#endif
#ifndef EXEC_PAGESIZE