Combine __USE_BSD and __USE_SVID into __USE_MISC.

This patch cleans up following the obsoletion of _BSD_SOURCE and
_SVID_SOURCE by combining __USE_BSD and __USE_SVID into __USE_MISC.

The only non-mechanical part of this patch is the changes to
features.h; everything else is simple substitution of __USE_MISC for
the old macros.  Thus, this patch leaves obviously redundant
conditionals such as "defined __USE_MISC || defined __USE_MISC", and
does not update #endif comments where they referred to BSD or SVID in
words instead of the literal macro name.  This is intended to
facilitate patch review by separating the less mechanical changes from
these purely mechanical changes into a separate patch.  (I do intend
to integrate all the changes from
<https://sourceware.org/ml/libc-alpha/2013-12/msg00226.html>, which I
believe includes all the trailing comment updates, in subsequent
patches.)

Tested x86_64.

	* include/features.h (__USE_BSD): Remove macro definitions.
	(__USE_SVID): Likewise.
	(_BSD_SOURCE): Likewise.
	(_SVID_SOURCE): Likewise.
	[!defined _BSD_SOURCE && !defined _SVID_SOURCE]: Remove condition
	from definition of _DEFAULT_SOURCE.
	[_BSD_SOURCE || _SVID_SOURCE]: Change condition to
	[_DEFAULT_SOURCE].
	* bits/fcntl.h [__USE_BSD]: Change condition to [__USE_MISC].
	* bits/mman.h [__USE_BSD]: Likewise.
	* bits/termios.h [__USE_BSD]: Likewise.
	* bits/waitstatus.h [__USE_BSD]: Likewise.
	* ctype/ctype.h [__USE_SVID]: Likewise.
	* dirent/dirent.h [__USE_BSD]: Likewise.
	* grp/grp.h [__USE_SVID]: Likewise.
	[__USE_BSD]: Likewise.
	* inet/netinet/igmp.h [__USE_BSD]: Likewise.
	* io/fcntl.h [__USE_BSD]: Likewise.
	* io/ftw.h [__USE_BSD]: Likewise.
	* io/sys/stat.h [__USE_BSD]: Likewise.
	* libio/bits/stdio-ldbl.h [__USE_BSD]: Likewise.
	* libio/bits/stdio2.h [__USE_BSD]: Likewise.
	* libio/stdio.h [__USE_SVID]: Likewise.
	[__USE_BSD]: Likewise.
	* math/math.h [__USE_SVID]: Likewise.
	[__USE_BSD]: Likewise.
	* misc/bits/syslog-ldbl.h [__USE_BSD]: Likewise.
	* misc/bits/syslog.h [__USE_BSD]: Likewise.
	* misc/search.h [__USE_SVID]: Likewise.
	* misc/sys/mman.h [__USE_BSD]: Likewise.
	* misc/sys/syslog.h [__USE_BSD]: Likewise.
	* misc/sys/uio.h [__USE_BSD]: Likewise.
	* posix/bits/unistd.h [__USE_BSD]: Likewise.
	* posix/glob.h [__USE_BSD]: Likewise.
	* posix/regex.h [__USE_BSD]: Likewise.
	* posix/sys/types.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.
	* posix/sys/utsname.h [__USE_SVID]: Likewise.
	* posix/sys/wait.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.
	* posix/unistd.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.
	* pwd/pwd.h [__USE_SVID]: Likewise.
	* resolv/netdb.h [__USE_BSD]: Likewise.
	* setjmp/setjmp.h [__USE_BSD]: Likewise.
	* signal/signal.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.
	* socket/sys/socket.h [__USE_BSD]: Likewise.
	* stdlib/fmtmsg.h [__USE_SVID]: Likewise.
	* stdlib/stdlib.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.
	* string/bits/string2.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.
	* string/bits/string3.h [__USE_BSD]: Likewise.
	* string/endian.h [__USE_BSD]: Likewise.
	* string/string.h [__USE_SVID]: Likewise.
	[__USE_BSD]: Likewise.
	* string/strings.h [__USE_BSD]: Likewise.
	* sysdeps/generic/netinet/ip.h [__USE_BSD]: Likewise.
	* sysdeps/gnu/netinet/ip_icmp.h [__USE_BSD]: Likewise.
	* sysdeps/mach/hurd/bits/fcntl.h [__USE_BSD]: Likewise.
	* sysdeps/mach/hurd/bits/stat.h [__USE_BSD]: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_BSD]: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/termios.h [__USE_BSD]:
	Likewise.
	* sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_BSD]:
	Likewise.
	* sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_BSD]: Likewise.
	* sysdeps/unix/sysv/linux/bits/sys_errlist.h [__USE_BSD]:
	Likewise.
	* sysdeps/unix/sysv/linux/bits/termios.h [__USE_BSD]: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/termios.h [__USE_BSD]:
	Likewise.
	* sysdeps/unix/sysv/linux/netinet/if_ether.h [__USE_BSD]:
	Likewise.
	* sysdeps/unix/sysv/linux/netinet/if_fddi.h [__USE_BSD]: Likewise.
	* sysdeps/unix/sysv/linux/netinet/if_tr.h [__USE_BSD]: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_BSD]:
	Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_BSD]:
	Likewise.
	* sysdeps/x86/bits/string.h [__USE_BSD]: Likewise.
	* sysvipc/sys/ipc.h [__USE_SVID]: Likewise.
	* termios/termios.h [__USE_BSD]: Likewise.
	* time/sys/time.h [__USE_BSD]: Likewise.
	* time/time.h [__USE_BSD]: Likewise.
	[__USE_SVID]: Likewise.

	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_BSD]: Change
	condition to [__USE_MISC].

4 files changed, 28 insertions, 28 deletions

diff --git a/bits/fcntl.h b/bits/fcntl.h
index 61b42dc166..c5eb3758bc 100644
--- a/bits/fcntl.h
+++ b/bits/fcntl.h
@@ -58,11 +58,11 @@
 #define	O_APPEND	0x0008	/* Writes append to the file.  */
 #define	O_NONBLOCK	0x0004	/* Non-blocking I/O.  */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define O_NDELAY	O_NONBLOCK
 #endif
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /* Bits in the file status flags returned by F_GETFL.
    These are all the O_* flags, plus FREAD and FWRITE, which are
    independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was
@@ -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_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
+#if defined __USE_MISC || 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/mman.h b/bits/mman.h
index 360f0d0c98..ba57af0885 100644
--- a/bits/mman.h
+++ b/bits/mman.h
@@ -37,7 +37,7 @@
 /* Flags contain mapping type, sharing type and options.  */
 
 /* Mapping type (must choose one and only one of these).  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define MAP_FILE	 0x0001	/* Mapped from a file or device.  */
 # define MAP_ANON	 0x0002	/* Allocated from anonymous virtual memory.  */
 # define MAP_TYPE	 0x000f	/* Mask for type field.  */
@@ -47,7 +47,7 @@
 #endif
 
 /* Sharing types (must choose one and only one of these).  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define MAP_COPY	 0x0020	/* Virtual copy of region at mapping time.  */
 #endif
 #define	MAP_SHARED	 0x0010	/* Share changes.  */
@@ -55,14 +55,14 @@
 
 /* Other flags.  */
 #define	MAP_FIXED	 0x0100	/* Map address must be exactly as requested. */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define MAP_NOEXTEND	 0x0200	/* For MAP_FILE, don't change file size.  */
 # define MAP_HASSEMPHORE 0x0400	/* Region may contain semaphores.  */
 # define MAP_INHERIT	 0x0800	/* Region is retained after exec.  */
 #endif
 
 /* Advice to `madvise'.  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define MADV_NORMAL	 0	/* No further special treatment.  */
 # define MADV_RANDOM	 1	/* Expect random page references.  */
 # define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
diff --git a/bits/termios.h b/bits/termios.h
index 9fd694a284..13442a5c7c 100644
--- a/bits/termios.h
+++ b/bits/termios.h
@@ -67,7 +67,7 @@
 
 #endif /* __USE_MISC || __USE_XOPEN */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 
 # ifdef MDMBUF
 #  undef MDMBUF
@@ -79,7 +79,7 @@
 #  undef PENDIN
 # endif
 
-#endif /* __USE_BSD */
+#endif /* __USE_MISC */
 
 #ifdef ECHO
 # undef ECHO
@@ -123,10 +123,10 @@ struct termios
 #define	ICRNL	(1 << 8)	/* Map CR to NL on input.  */
 #define	IXON	(1 << 9)	/* Enable start/stop output control.  */
 #define	IXOFF	(1 << 10)	/* Enable start/stop input control.  */
-#if defined __USE_BSD || defined __USE_UNIX98
+#if defined __USE_MISC || defined __USE_UNIX98
 # define IXANY	(1 << 11)	/* Any character will restart after stop.  */
 #endif
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define IMAXBEL (1 << 13)	/* Ring bell when input queue is full.  */
 #endif
 #ifdef __USE_GNU
@@ -136,14 +136,14 @@ struct termios
   /* Output modes.  */
   tcflag_t c_oflag;
 #define	OPOST	(1 << 0)	/* Perform output processing.  */
-#if defined __USE_BSD || defined __USE_XOPEN
+#if defined __USE_MISC || defined __USE_XOPEN
 # define ONLCR	(1 << 1)	/* Map NL to CR-NL on output.  */
 #endif
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define OXTABS	TAB3		/* Expand tabs to spaces.  */
 # define ONOEOT	(1 << 3)	/* Discard EOT (^D) on output.  */
 #endif
-#if defined __USE_BSD || defined __USE_XOPEN
+#if defined __USE_MISC || defined __USE_XOPEN
 # define OCRNL	(1 << 4)	/* Map CR to NL.  */
 # define ONOCR	(1 << 5)	/* Discard CR's when on column 0.  */
 # define ONLRET	(1 << 6)	/* Move to column 0 on NL.  */
@@ -181,7 +181,7 @@ struct termios
 
   /* Control modes.  */
   tcflag_t c_cflag;
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define CIGNORE	(1 << 0)	/* Ignore these control flags.  */
 #endif
 #define	CSIZE	(CS5|CS6|CS7|CS8)	/* Number of bits per byte (mask).  */
@@ -195,7 +195,7 @@ struct termios
 #define	PARODD	(1 << 13)	/* Odd parity instead of even.  */
 #define	HUPCL	(1 << 14)	/* Hang up on last close.  */
 #define	CLOCAL	(1 << 15)	/* Ignore modem status lines.  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define CRTSCTS	(1 << 16)	/* RTS/CTS flow control.  */
 # define CRTS_IFLOW	CRTSCTS		/* Compatibility.  */
 # define CCTS_OFLOW	CRTSCTS		/* Compatibility.  */
@@ -206,7 +206,7 @@ struct termios
 
   /* Local modes.  */
   tcflag_t c_lflag;
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define ECHOKE	(1 << 0)	/* Visual erase for KILL.  */
 #endif
 #define	_ECHOE	(1 << 1)	/* Visual erase for ERASE.  */
@@ -217,7 +217,7 @@ struct termios
 #define	ECHO	_ECHO
 #define	_ECHONL	(1 << 4)	/* Echo NL even if ECHO is off.  */
 #define	ECHONL	_ECHONL
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define ECHOPRT	(1 << 5)	/* Hardcopy visual erase.  */
 # define ECHOCTL	(1 << 6)	/* Echo control characters as ^X.  */
 #endif
@@ -225,7 +225,7 @@ struct termios
 #define	ISIG	_ISIG
 #define	_ICANON	(1 << 8)	/* Do erase and kill processing.  */
 #define	ICANON	_ICANON
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define ALTWERASE (1 << 9)	/* Alternate WERASE algorithm.  */
 #endif
 #define	_IEXTEN	(1 << 10)	/* Enable DISCARD and LNEXT.  */
@@ -233,7 +233,7 @@ struct termios
 #define	EXTPROC	(1 << 11)	/* External processing.  */
 #define	_TOSTOP	(1 << 22)	/* Send SIGTTOU for background output.  */
 #define	TOSTOP	_TOSTOP
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define FLUSHO	(1 << 23)	/* Output being flushed (state).  */
 # define NOKERNINFO (1 << 25)	/* Disable VSTATUS.  */
 # define PENDIN	(1 << 29)	/* Retype pending input (state).  */
@@ -244,32 +244,32 @@ struct termios
   /* Control characters.  */
 #define	VEOF	0		/* End-of-file character [ICANON].  */
 #define	VEOL	1		/* End-of-line character [ICANON].  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define VEOL2	2		/* Second EOL character [ICANON].  */
 #endif
 #define	VERASE	3		/* Erase character [ICANON].  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define VWERASE	4		/* Word-erase character [ICANON].  */
 #endif
 #define	VKILL	5		/* Kill-line character [ICANON].  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define VREPRINT 6		/* Reprint-line character [ICANON].  */
 #endif
 #define	VINTR	8		/* Interrupt character [ISIG].  */
 #define	VQUIT	9		/* Quit character [ISIG].  */
 #define	VSUSP	10		/* Suspend character [ISIG].  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define VDSUSP	11		/* Delayed suspend character [ISIG].  */
 #endif
 #define	VSTART	12		/* Start (X-ON) character [IXON, IXOFF].  */
 #define	VSTOP	13		/* Stop (X-OFF) character [IXON, IXOFF].  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define VLNEXT	14		/* Literal-next character [IEXTEN].  */
 # define VDISCARD 15		/* Discard character [IEXTEN].  */
 #endif
 #define	VMIN	16		/* Minimum number of bytes read at once [!ICANON].  */
 #define	VTIME	17		/* Time-out value (tenths of a second) [!ICANON].  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define VSTATUS	18		/* Status character [ICANON].  */
 #endif
 #define	NCCS	20		/* Value duplicated in <hurd/tioctl.defs>.  */
@@ -325,7 +325,7 @@ struct termios
 #define	TCSANOW		0	/* Change immediately.  */
 #define	TCSADRAIN	1	/* Change when pending output is written.  */
 #define	TCSAFLUSH	2	/* Flush pending input before changing.  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define TCSASOFT	0x10	/* Flag: Don't alter hardware state.  */
 #endif
 
diff --git a/bits/waitstatus.h b/bits/waitstatus.h
index baa3962e09..76f9ee48e9 100644
--- a/bits/waitstatus.h
+++ b/bits/waitstatus.h
@@ -59,7 +59,7 @@
 #define	__WCOREFLAG		0x80
 
 
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 
 # include <endian.h>