From e47d82c99a6db060419b421768aced76bea92997 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 8 Feb 2019 16:51:17 +0100 Subject: Provide as a sysdeps header exclusively Non-sysdeps headers cannot be overriden by sysdeps headers across the entire build, so it is necessary to turn such extension headers into sysdeps headers themselves. The approach here follows the existing header (although it uses sysdeps/gnu instead of sysdeps/generic). Fixes commit 1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92 ("Linux: Add gettid system call wrapper [BZ #6399]") and commit 8f89ab216f205c2ffd90d1fc8454efdfc0b01dee ("posix: Fix missing wrapper header for "). --- ChangeLog | 6 ++++++ include/bits/unistd_ext.h | 1 - posix/bits/unistd_ext.h | 21 --------------------- sysdeps/generic/bits/unistd_ext.h | 21 +++++++++++++++++++++ 4 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 include/bits/unistd_ext.h delete mode 100644 posix/bits/unistd_ext.h create mode 100644 sysdeps/generic/bits/unistd_ext.h diff --git a/ChangeLog b/ChangeLog index 164db3f085..62a78a193f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-02-08 Florian Weimer + + * include/bits/unistd_ext.h: Remove file. + * posix/bits/unistd_ext.h: Move to ... + * sysdeps/generic/bits/unistd_ext.h: ... here. + 2019-02-08 Florian Weimer * include/bits/unistd_ext.h: New file. diff --git a/include/bits/unistd_ext.h b/include/bits/unistd_ext.h deleted file mode 100644 index 24e8d09ba8..0000000000 --- a/include/bits/unistd_ext.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/posix/bits/unistd_ext.h b/posix/bits/unistd_ext.h deleted file mode 100644 index d6e88f3bd4..0000000000 --- a/posix/bits/unistd_ext.h +++ /dev/null @@ -1,21 +0,0 @@ -/* System-specific extensions of , generic version. - Copyright (C) 2019 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 _UNISTD_H -# error "Never include directly; use instead." -#endif diff --git a/sysdeps/generic/bits/unistd_ext.h b/sysdeps/generic/bits/unistd_ext.h new file mode 100644 index 0000000000..d6e88f3bd4 --- /dev/null +++ b/sysdeps/generic/bits/unistd_ext.h @@ -0,0 +1,21 @@ +/* System-specific extensions of , generic version. + Copyright (C) 2019 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 _UNISTD_H +# error "Never include directly; use instead." +#endif -- cgit v1.2.3