Complete _BSD_SOURCE / _SVID_source followup cleanup.

This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
author: Joseph Myers <joseph@codesourcery.com> 2014-02-21 21:45:26 +0000
committer: Joseph Myers <joseph@codesourcery.com> 2014-02-21 21:45:26 +0000
commit: acd7f096d79c181866d56d4aaf3b043e741f1e2c (patch)
tree: 94c060877bad764909f81a59eed8e62a17b84576
parent: a5d82e4e34d627f6347b8dbd79046db7df5f93b6 (diff)
download: glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.tar.xz
glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.zip
52 files changed, 255 insertions, 178 deletions
diff --git a/ChangeLog b/ChangeLog
index 913009b8be..41491f6b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,84 @@
+2014-02-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* bits/fcntl.h [__USE_MISC]: Remove redundant conditionals.
+	* bits/sigaction.h [__USE_MISC]: Likewise.
+	* bits/waitstatus.h: Update #endif comments.
+	* ctype/ctype.h: Likewise.
+	* dirent/dirent.h: Likewise.
+	[__USE_MISC]: Remove redundant conditionals.
+	* grp/grp.h: Update #endif comments.
+	[__USE_GNU]: Remove redundant conditionals.
+	[__USE_MISC]: Likewise.
+	* inet/netinet/in.h [__USE_GNU]: Likewise.
+	* io/sys/stat.h [__USE_MISC]: Likewise.
+	* libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise.
+	* libio/bits/stdio.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* libio/bits/stdio2.h [__USE_MISC]: Likewise.
+	* libio/stdio.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* math/bits/math-finite.h [__USE_MISC]: Likewise.
+	* math/bits/mathcalls.h [__USE_MISC]: Likewise.
+	* math/math.h: Update #else and #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* misc/sys/uio.h: Update #endif comments.
+	* posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals.
+	* posix/glob.h [__USE_MISC]: Likewise.
+	* posix/sys/types.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* posix/sys/wait.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* posix/unistd.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* pwd/pwd.h [__USE_GNU]: Likewise.
+	[__USE_MISC]: Likewise.
+	* resolv/netdb.h [__USE_GNU]: Likewise.
+	* signal/signal.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* stdlib/stdlib.h: Update #else and #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	[__USE_GNU]: Likewise.
+	* string/bits/string2.h [__USE_MISC]: Likewise.
+	* string/string.h: Update #endif comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise.
+	* sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif
+	comments.
+	[__USE_MISC]: Remove redundant conditionals.
+	* sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise.
+	* sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise.
+	* sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]:
+	Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise.
+	* sysdeps/x86/bits/string.h: Update #endif comments.
+	* sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant
+	conditionals.
+	* time/sys/time.h: Update #endif comments.
+	* time/time.h: Likewise.
+	[__USE_MISC]: Remove redundant conditionals.
+
 2014-02-21  Yury Gribov  <y.gribov@samsung.com>
 
 	[BZ #16600]
diff --git a/bits/fcntl.h b/bits/fcntl.h
index c5eb3758bc..088d293fda 100644
--- a/bits/fcntl.h
+++ b/bits/fcntl.h
@@ -88,7 +88,7 @@
 #define	F_SETFD		2	/* Set file descriptor flags.  */
 #define	F_GETFL		3	/* Get file status flags.  */
 #define	F_SETFL		4	/* Set file status flags.  */
-#if defined __USE_MISC || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 #define	F_GETOWN	5	/* Get owner (receiver of SIGIO).  */
 #define	F_SETOWN	6	/* Set owner (receiver of SIGIO).  */
 #endif
diff --git a/bits/sigaction.h b/bits/sigaction.h
index 951a5c41d3..6a0a8b29b4 100644
--- a/bits/sigaction.h
+++ b/bits/sigaction.h
@@ -55,7 +55,7 @@ struct sigaction
 #if defined __USE_UNIX98 || defined __USE_MISC
 # define SA_ONSTACK	0x0001	/* Take signal on signal stack.  */
 #endif
-#if defined __USE_UNIX98 || defined __USE_MISC || defined __USE_XOPEN2K8
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 # define SA_RESTART	0x0002	/* Restart syscall on signal return.  */
 # define SA_NODEFER	0x0010	/* Don't automatically block the signal when
 				    its handler is being executed.  */
diff --git a/bits/waitstatus.h b/bits/waitstatus.h
index 76f9ee48e9..5087574827 100644
--- a/bits/waitstatus.h
+++ b/bits/waitstatus.h
@@ -102,4 +102,4 @@ union wait
 # define w_stopsig	__wait_stopped.__w_stopsig
 # define w_stopval	__wait_stopped.__w_stopval
 
-#endif	/* Use BSD.  */
+#endif	/* Use misc.  */
diff --git a/ctype/ctype.h b/ctype/ctype.h
index a493b9281b..0a9ffba555 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -157,7 +157,7 @@ extern int toascii (int __c) __THROW;
    check the argument for being in the range of a `char'.  */
 __exctype (_toupper);
 __exctype (_tolower);
-#endif /* Use SVID or use misc.  */
+#endif /* Use X/Open or use misc.  */
 
 /* This code is needed for the optimized mapping functions.  */
 #define __tobody(c, f, a, args) \
diff --git a/dirent/dirent.h b/dirent/dirent.h
index bf37a7f58c..f6db6c683b 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -173,7 +173,7 @@ extern struct dirent *__REDIRECT (readdir, (DIR *__dirp), readdir64)
 extern struct dirent64 *readdir64 (DIR *__dirp) __nonnull ((1));
 #endif
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 /* Reentrant version of `readdir'.  Return in RESULT a pointer to the
    next entry.
 
@@ -217,7 +217,7 @@ extern void seekdir (DIR *__dirp, long int __pos) __THROW __nonnull ((1));
 extern long int telldir (DIR *__dirp) __THROW __nonnull ((1));
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN2K8
+#ifdef __USE_XOPEN2K8
 
 /* Return the file descriptor used by DIRP.  */
 extern int dirfd (DIR *__dirp) __THROW __nonnull ((1));
@@ -340,7 +340,7 @@ extern int alphasort64 (const struct dirent64 **__e1,
 			const struct dirent64 **__e2)
      __THROW __attribute_pure__ __nonnull ((1, 2));
 # endif
-#endif /* Use BSD or misc or XPG7.  */
+#endif /* Use XPG7.  */
 
 
 #ifdef __USE_MISC
@@ -371,7 +371,7 @@ extern __ssize_t getdirentries64 (int __fd, char *__restrict __buf,
 				  __off64_t *__restrict __basep)
      __THROW __nonnull ((2, 4));
 # endif
-#endif /* Use BSD or misc.  */
+#endif /* Use misc.  */
 
 #ifdef __USE_GNU
 /* Function to compare two `struct dirent's by name & version.  */
diff --git a/grp/grp.h b/grp/grp.h
index 5bdc221e4f..10b2a4119a 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -48,7 +48,7 @@ struct group
   };
 
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 # define __need_FILE
 # include <stdio.h>
 #endif
@@ -62,8 +62,7 @@ struct group
 extern void setgrent (void);
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED \
-    || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* Close the group-file stream.
 
    This function is a possible cancellation point and therefore not
@@ -110,7 +109,7 @@ extern struct group *getgrgid (__gid_t __gid);
    marked with __THROW.  */
 extern struct group *getgrnam (const char *__name);
 
-#if defined __USE_POSIX || defined __USE_MISC
+#ifdef __USE_POSIX
 
 # ifdef __USE_MISC
 /* Reasonable value for the buffer sized used in the reentrant
@@ -200,7 +199,7 @@ extern int getgrouplist (const char *__user, __gid_t __group,
    therefore not marked with __THROW.  */
 extern int initgroups (const char *__user, __gid_t __group);
 
-#endif /* Use BSD.  */
+#endif /* Use misc.  */
 
 __END_DECLS
 
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index d8d8e53631..ca491bef77 100644
--- a/inet/netinet/in.h
+++ b/
author	Joseph Myers <joseph@codesourcery.com>	2014-02-21 21:45:26 +0000
committer	Joseph Myers <joseph@codesourcery.com>	2014-02-21 21:45:26 +0000
commit	acd7f096d79c181866d56d4aaf3b043e741f1e2c (patch)
tree	94c060877bad764909f81a59eed8e62a17b84576
parent	a5d82e4e34d627f6347b8dbd79046db7df5f93b6 (diff)
download	glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.tar.xz glibc-acd7f096d79c181866d56d4aaf3b043e741f1e2c.zip