From 430fd94599e20a71a38a01135bcafe2719a0bd8f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 4 Mar 2018 00:42:20 +0100 Subject: hurd: Move mach/param.h to bits/mach/param.h * mach/Makefile (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 instead of . --- ChangeLog | 5 +++++ mach/Makefile | 2 +- sysdeps/mach/hurd/bits/param.h | 2 +- sysdeps/mach/i386/bits/mach/param.h | 25 +++++++++++++++++++++++++ sysdeps/mach/i386/mach/param.h | 25 ------------------------- 5 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 sysdeps/mach/i386/bits/mach/param.h delete mode 100644 sysdeps/mach/i386/mach/param.h diff --git a/ChangeLog b/ChangeLog index 3d8aa9c..9bfa1bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ * hurd/hurd/lookup.h: Include * mach/Makefile ($(objpfx)mach-shortcuts.h): Make it include and . + (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 instead + of . 2018-03-03 Andreas Schwab 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 directly; include instead." #endif -#include +#include /* 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/bits/mach/param.h b/sysdeps/mach/i386/bits/mach/param.h new file mode 100644 index 0000000..15e842f --- /dev/null +++ b/sysdeps/mach/i386/bits/mach/param.h @@ -0,0 +1,25 @@ +/* Old-style Unix parameters and limits. i386 Mach version. + Copyright (C) 1993-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_PARAM_H +# error "Never use directly; include instead." +#endif + +#ifndef EXEC_PAGESIZE +#define EXEC_PAGESIZE 4096 +#endif diff --git a/sysdeps/mach/i386/mach/param.h b/sysdeps/mach/i386/mach/param.h deleted file mode 100644 index 20329ff..0000000 --- a/sysdeps/mach/i386/mach/param.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Old-style Unix parameters and limits. i386 Mach version. - Copyright (C) 1993-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _SYS_PARAM_H -# error "Never use directly; include instead." -#endif - -#ifndef EXEC_PAGESIZE -#define EXEC_PAGESIZE 4096 -#endif -- cgit v1.1