From ed9a38e21b8c7b4f413d7f8e3fc183297df3c2be Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 13 Feb 2014 22:07:25 +0000 Subject: Clean up trivially redundant __USE_MISC conditionals. This patch cleans up cases of __USE_MISC that are trivially redundant after the recent substitution of __USE_MISC for __USE_BSD and __USE_SVID: either in constructs such as "defined __USE_MISC || defined __USE_MISC", or else (in the bits/mman.h case) a conditional on __USE_MISC nested inside another __USE_MISC conditional. (The cleanups remaining after this patch are still quite large, but it seems a reasonable piece to separate out.) Tested x86_64. * bits/mman.h [__USE_MISC]: Remove redundant conditionals. * ctype/ctype.h [__USE_MISC]: Likewise. * dirent/dirent.h [__USE_MISC]: Likewise. * grp/grp.h [__USE_MISC]: Likewise. * io/fcntl.h [__USE_MISC]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/stdio.h [__USE_MISC]: Likewise. * posix/unistd.h [__USE_MISC]: Likewise. * pwd/pwd.h [__USE_MISC]: Likewise. * stdlib.h [__USE_MISC]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h [__USE_MISC]: Likewise. * time/time.h [__USE_MISC]: Likewise. --- string/bits/string2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'string/bits/string2.h') diff --git a/string/bits/string2.h b/string/bits/string2.h index fb835799ba..ad7316b4b6 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1287,7 +1287,7 @@ extern char *__strdup (const char *__string) __THROW __attribute_malloc__; __retval; })) \ : __strdup (s))) -# if defined __USE_MISC || defined __USE_MISC || defined __USE_XOPEN_EXTENDED +# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED # define strdup(s) __strdup (s) # endif # endif -- cgit v1.2.1