From patchwork Sat Mar 3 23:43:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26177 Received: (qmail 91983 invoked by alias); 3 Mar 2018 23:43:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 91970 invoked by uid 89); 3 Mar 2018 23:43:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=H*r:sk:static-, Hx-spam-relays-external:sk:static-, H*RU:sk:static- X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Move mach/param.h to bits/mach/param.h Date: Sun, 4 Mar 2018 00:43:26 +0100 Message-Id: <20180303234326.30553-1-samuel.thibault@ens-lyon.org> * 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 | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) rename sysdeps/mach/i386/{ => bits}/mach/param.h (92%) diff --git a/ChangeLog b/ChangeLog index 3d8aa9c17e..9bfa1bd316 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 d16c44f885..e0d1ffb1fa 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 7d535712a4..5d4faf793f 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/mach/param.h b/sysdeps/mach/i386/bits/mach/param.h similarity index 92% rename from sysdeps/mach/i386/mach/param.h rename to sysdeps/mach/i386/bits/mach/param.h index 20329ff8fc..15e842f4d3 100644 --- a/sysdeps/mach/i386/mach/param.h +++ b/sysdeps/mach/i386/bits/mach/param.h @@ -17,7 +17,7 @@ . */ #ifndef _SYS_PARAM_H -# error "Never use directly; include instead." +# error "Never use directly; include instead." #endif #ifndef EXEC_PAGESIZE