From patchwork Sat Feb 10 18:17:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 25901 Received: (qmail 95520 invoked by alias); 10 Feb 2018 18:17:31 -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 95510 invoked by uid 89); 10 Feb 2018 18:17:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Cc: joseph@codesourcery.com, ricaljasan@pacific.net, schwab@suse.de Subject: [PATCH] [BZ 19239] Don't include sys/sysmacros.h from sys/types.h. Date: Sat, 10 Feb 2018 13:17:27 -0500 Message-Id: <20180210181727.22899-1-zackw@panix.com> MIME-Version: 1.0 This completes the deprecation and removal of this inclusion, which was begun in the 2.25 release. * posix/sys/types.h: Don't include sys/sysmacros.h. * misc/sys/sysmacros.h: Remove the conditional deprecation warnings for the macros defined by this header. --- NEWS | 11 +++++++++++ misc/sys/sysmacros.h | 52 +++------------------------------------------------- posix/sys/types.h | 9 --------- 3 files changed, 14 insertions(+), 58 deletions(-) diff --git a/NEWS b/NEWS index 56780313f50..60dd2f778d9 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,17 @@ Deprecated and removed features, and other changes affecting compatibility: investigate using (f)getc_unlocked and (f)putc_unlocked, and, if necessary, flockfile and funlockfile. + * The macros 'major', 'minor', and 'makedev' are now only available from + the header ; not from or various other + headers that happen to include . These macros are rarely + used, not part of POSIX nor XSI, and their names frequently collide with + user code; see https://sourceware.org/bugzilla/show_bug.cgi?id=19239 for + further explanation. + + is a GNU extension. Portable programs that require + these macros should first include , and then include + if __GNU_LIBRARY__ is defined. + Changes to build and runtime requirements: [Add changes to build and runtime requirements here] diff --git a/misc/sys/sysmacros.h b/misc/sys/sysmacros.h index ccc15e5b3cf..699e03865ff 100644 --- a/misc/sys/sysmacros.h +++ b/misc/sys/sysmacros.h @@ -16,23 +16,6 @@ License along with the GNU C Library; if not, see . */ -#ifndef _SYS_SYSMACROS_H_OUTER - -#ifndef __SYSMACROS_DEPRECATED_INCLUSION -# define _SYS_SYSMACROS_H_OUTER 1 -#endif - -/* If is included after , these macros - will already be defined, and we need to redefine them without the - deprecation warnings. (If they are included in the opposite order, - the outer #ifndef will suppress this entire file and the macros - will be usable without warnings.) */ -#undef major -#undef minor -#undef makedev - -/* This is the macro that must be defined to satisfy the misuse check - in bits/sysmacros.h. */ #ifndef _SYS_SYSMACROS_H #define _SYS_SYSMACROS_H 1 @@ -40,27 +23,6 @@ #include #include -/* Caution: The text of this deprecation message is unquoted, so that - #symbol can be substituted. (It is converted to a string by - __SYSMACROS_DM1.) This means the message must be a sequence of - complete pp-tokens; in particular, English contractions (it's, - can't) cannot be used. - - The message has been manually word-wrapped to fit in 80 columns - when output by GCC 5 and 6. The first line is shorter to leave - some room for the "foo.c:23: warning:" annotation. */ -#define __SYSMACROS_DM(symbol) __SYSMACROS_DM1 \ - (In the GNU C Library, #symbol is defined\n\ - by . For historical compatibility, it is\n\ - currently defined by as well, but we plan to\n\ - remove this soon. To use #symbol, include \n\ - directly. If you did not intend to use a system-defined macro\n\ - #symbol, you should undefine it after including .) - -/* This macro is variadic because the deprecation message above - contains commas. */ -#define __SYSMACROS_DM1(...) __glibc_macro_warning (#__VA_ARGS__) - #define __SYSMACROS_DECL_TEMPL(rtype, name, proto) \ extern rtype gnu_dev_##name proto __THROW __attribute_const__; @@ -84,8 +46,6 @@ __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_IMPL_TEMPL) __END_DECLS -#endif /* _SYS_SYSMACROS_H */ - #ifndef __SYSMACROS_NEED_IMPLEMENTATION # undef __SYSMACROS_DECL_TEMPL # undef __SYSMACROS_IMPL_TEMPL @@ -97,14 +57,8 @@ __END_DECLS # undef __SYSMACROS_DEFINE_MAKEDEV #endif -#ifdef __SYSMACROS_DEPRECATED_INCLUSION -# define major(dev) __SYSMACROS_DM (major) gnu_dev_major (dev) -# define minor(dev) __SYSMACROS_DM (minor) gnu_dev_minor (dev) -# define makedev(maj, min) __SYSMACROS_DM (makedev) gnu_dev_makedev (maj, min) -#else -# define major(dev) gnu_dev_major (dev) -# define minor(dev) gnu_dev_minor (dev) -# define makedev(maj, min) gnu_dev_makedev (maj, min) -#endif +#define major(dev) gnu_dev_major (dev) +#define minor(dev) gnu_dev_minor (dev) +#define makedev(maj, min) gnu_dev_makedev (maj, min) #endif /* sys/sysmacros.h */ diff --git a/posix/sys/types.h b/posix/sys/types.h index e8d51a1342a..db524d6cd13 100644 --- a/posix/sys/types.h +++ b/posix/sys/types.h @@ -194,15 +194,6 @@ typedef int register_t __attribute__ ((__mode__ (__word__))); /* It also defines `fd_set' and the FD_* macros for `select'. */ # include - -/* BSD defines `major', `minor', and `makedev' in this header. - However, these symbols are likely to collide with user code, so we are - going to stop defining them here in an upcoming release. Code that needs - these macros should include directly. Code that does - not need these macros should #undef them after including this header. */ -# define __SYSMACROS_DEPRECATED_INCLUSION -# include -# undef __SYSMACROS_DEPRECATED_INCLUSION #endif /* Use misc. */