diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-01-20 17:34:29 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-01-20 17:34:29 +0100 |
| commit | f0dfc72f9d9bae2e8b210113ca2c4a4428d4cb5b (patch) | |
| tree | f7454314d1fe7c613ecded2a524004fff3942593 /include | |
| parent | 1795b735237206f4798e2ff831327521e14dde2c (diff) | |
| parent | e3b7670be21d6992e3ca9ee1ad3a5d08eb3a24c9 (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/features.h b/include/features.h index 7827cc2173..439f087d8e 100644 --- a/include/features.h +++ b/include/features.h @@ -146,8 +146,7 @@ /* If _BSD_SOURCE was defined by the user, favor BSD over POSIX. */ #if defined _BSD_SOURCE && \ !(defined _POSIX_SOURCE || defined _POSIX_C_SOURCE || \ - defined _XOPEN_SOURCE || defined _XOPEN_SOURCE_EXTENDED || \ - defined _GNU_SOURCE || defined _SVID_SOURCE) + defined _XOPEN_SOURCE || defined _GNU_SOURCE || defined _SVID_SOURCE) # define __FAVOR_BSD 1 #endif @@ -179,8 +178,7 @@ define _BSD_SOURCE and _SVID_SOURCE. */ #if (!defined __STRICT_ANSI__ && !defined _ISOC99_SOURCE && \ !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE && \ - !defined _XOPEN_SOURCE && !defined _XOPEN_SOURCE_EXTENDED && \ - !defined _BSD_SOURCE && !defined _SVID_SOURCE) + !defined _XOPEN_SOURCE && !defined _BSD_SOURCE && !defined _SVID_SOURCE) # define _BSD_SOURCE 1 # define _SVID_SOURCE 1 #endif |