From ade40b10ff5fa59a318cf55b9d8414b758e8df78 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Tue, 25 Feb 2014 13:23:25 -0500 Subject: BZ #16632: Change [_BSD/_SVID]_SOURCE warning. Source packages that need to support both 2.19 and 2.20 will need to decide to use _BSD_SOURCE and _SVID_SOURCE vs. _DEFAULT_SOURCE. The difficulty in making that decision is that __GLIBC_MINOR__ is itself defined in features.h, but you want to set the feature test macros before including features.h. Therefore to ease the transition we should disable the warning if _DEFAULT_SOURCE is also defined. https://sourceware.org/ml/libc-alpha/2014-02/msg00666.html https://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes --- include/features.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/features.h b/include/features.h index 75237a7984..c3ed81fa19 100644 --- a/include/features.h +++ b/include/features.h @@ -140,8 +140,11 @@ #endif /* _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for - _DEFAULT_SOURCE. */ -#if defined _BSD_SOURCE || defined _SVID_SOURCE + _DEFAULT_SOURCE. If _DEFAULT_SOURCE is present we do not + issue a warning; the expectation is that the source is being + transitioned to use the new macro. */ +#if (defined _BSD_SOURCE || defined _SVID_SOURCE) \ + && !defined _DEFAULT_SOURCE # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" # undef _DEFAULT_SOURCE # define _DEFAULT_SOURCE 1 -- cgit 1.4.1