[Glibc-bsd-commits] r5780 - in trunk/glibc-ports/kfreebsd: bits netinet

aurel32 at alioth.debian.org aurel32 at alioth.debian.org
Mon Oct 19 22:14:19 UTC 2015


Author: aurel32
Date: 2015-10-19 22:14:19 +0000 (Mon, 19 Oct 2015)
New Revision: 5780

Modified:
   trunk/glibc-ports/kfreebsd/bits/fcntl.h
   trunk/glibc-ports/kfreebsd/bits/ipc.h
   trunk/glibc-ports/kfreebsd/bits/mman.h
   trunk/glibc-ports/kfreebsd/bits/poll.h
   trunk/glibc-ports/kfreebsd/bits/sem.h
   trunk/glibc-ports/kfreebsd/bits/shm.h
   trunk/glibc-ports/kfreebsd/bits/socket.h
   trunk/glibc-ports/kfreebsd/bits/stat.h
   trunk/glibc-ports/kfreebsd/bits/sys_errlist.h
   trunk/glibc-ports/kfreebsd/bits/termios.h
   trunk/glibc-ports/kfreebsd/bits/time.h
   trunk/glibc-ports/kfreebsd/bits/uio.h
   trunk/glibc-ports/kfreebsd/bits/waitflags.h
   trunk/glibc-ports/kfreebsd/bits/waitstatus.h
   trunk/glibc-ports/kfreebsd/netinet/if_ether.h
   trunk/glibc-ports/kfreebsd/netinet/ip_icmp.h
Log:
Following upstream commit 498afc54, merge __USE_BSD and __USE_SVID into __USE_MISC


Modified: trunk/glibc-ports/kfreebsd/bits/fcntl.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/fcntl.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/fcntl.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -49,7 +49,7 @@
 #define	O_NDELAY	O_NONBLOCK	/* compat */
 #define	O_APPEND	0x0008		/* set append mode */
 
-#if __USE_BSD
+#if defined __USE_MISC
 #define	O_SHLOCK	0x0010		/* open with shared file lock */
 #define	O_EXLOCK	0x0020		/* open with exclusive file lock */
 #endif
@@ -58,7 +58,7 @@
 #define	O_FSYNC		0x0080		/* synchronous writes */
 #define	O_SYNC		O_FSYNC		/* POSIX synonym for O_FSYNC */
 
-#if defined (__USE_XOPEN2K8) || defined (__USE_BSD)
+#if defined (__USE_XOPEN2K8) || defined (__USE_MISC)
 #define	O_NOFOLLOW	0x0100		/* don't follow symlinks */
 #endif
 
@@ -68,19 +68,19 @@
 /* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */
 #define	O_NOCTTY	0x8000		/* don't assign controlling terminal */
 
-#if __USE_BSD
+#if defined __USE_MISC
 /* Attempt to bypass buffer cache */
 #define	O_DIRECT	0x00010000
 enum { O_NOATIME = 0};          /* Do not set atime.  */
 #endif
 
 /* Defined by POSIX Extended API Set Part 2 */
-#if defined (__USE_XOPEN2K8) || defined (__USE_BSD)
+#if defined (__USE_XOPEN2K8) || defined (__USE_MISC)
 #define	O_DIRECTORY	0x00020000	/* Fail if not directory */
 #define	O_EXEC		0x00040000	/* Open for execute only */
 #endif
 
-#if defined (__USE_XOPEN2K8) || defined (__USE_BSD)
+#if defined (__USE_XOPEN2K8) || defined (__USE_MISC)
 /* Defined by POSIX 1003.1-2008; BSD default, but reserve for future use. */
 #define	O_TTY_INIT	0x00080000	/* Restore default termios attributes */
 #define	O_CLOEXEC	0x00100000
@@ -97,7 +97,7 @@
 /* Since 'off_t' is 64-bit, O_LARGEFILE is a no-op.  */
 #define O_LARGEFILE	0
 
-#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
@@ -124,7 +124,7 @@
  * initial open syscall.  Those bits can thus be given a
  * different meaning for fcntl(2).
  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /*
  * Set by shm_open(3) to get automatic MAP_ASYNC behavior
  * for POSIX shared memory objects (which are otherwise
@@ -148,11 +148,11 @@
 #define F_SETLK64	12	/* Set record locking info (non-blocking).  */
 #define F_SETLKW64	13	/* Set record locking info (blocking).	*/
 
-#if __USE_BSD || __POSIX_VISIBLE >= 200809
+#if defined __USE_MISC || __POSIX_VISIBLE >= 200809
 #define	F_DUPFD_CLOEXEC	17	/* Like F_DUPFD, but FD_CLOEXEC is set */
 #endif
 
-#if defined __USE_BSD || defined __USE_UNIX98
+#if defined __USE_MISC || defined __USE_UNIX98
 # define F_GETOWN	5	/* Get owner of socket (receiver of SIGIO).  */
 # define F_SETOWN	6	/* Set owner of socket (receiver of SIGIO).  */
 #endif
@@ -164,12 +164,12 @@
 #define	F_RDLCK		1		/* shared or read lock */
 #define	F_UNLCK		2		/* unlock */
 #define	F_WRLCK		3		/* exclusive or write lock */
-#if __USE_BSD
+#if defined __USE_MISC
 #define	F_UNLCKSYS	4		/* purge locks for a given system ID */ 
 #define	F_CANCEL	5		/* cancel an async lock request */
 #endif
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /* Operations for bsd flock(), also used by the kernel implementation.	*/
 # define LOCK_SH	1	/* shared lock */
 # define LOCK_EX	2	/* exclusive lock */
@@ -202,7 +202,7 @@
 
 /* Define some more compatibility macros to be backward compatible with
    BSD systems which did not managed to hide these kernel macros.  */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define FAPPEND	O_APPEND
 # define FFSYNC		O_FSYNC
 # define FASYNC		O_ASYNC

Modified: trunk/glibc-ports/kfreebsd/bits/ipc.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/ipc.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/ipc.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -35,7 +35,7 @@
 /* Special key values.  */
 #define IPC_PRIVATE	((__key_t) 0)	/* private key */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /* Common mode bits.  */
 # define IPC_R		0400		/* read permission, same as S_IRUSR */
 # define IPC_W		0200		/* write permission, same as S_IWUSR */

Modified: trunk/glibc-ports/kfreebsd/bits/mman.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/mman.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/mman.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -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	 0x0000	/* Mapped from a file or device.  */
 # define MAP_ANON	 0x1000	/* Allocated from anonymous virtual memory.  */
 # define MAP_TYPE	 0x1000	/* Mask for type field.  */
@@ -49,13 +49,13 @@
 /* Sharing types (must choose one and only one of these).  */
 #define	MAP_SHARED	 0x0001	/* Share changes.  */
 #define	MAP_PRIVATE	 0x0002	/* Changes private; copy pages on write.  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define MAP_COPY MAP_PRIVATE	/* Virtual copy of region at mapping time.  */
 #endif
 
 /* Other flags.  */
 #define	MAP_FIXED	 0x0010	/* Map address must be exactly as requested. */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 #define MAP_RENAME	 0x0020 /* Sun: rename private pages to file */
 #define MAP_NORESERVE	 0x0040 /* Sun: don't reserve needed swap area */
 #define MAP_RESERVED0080 0x0080	/* previously misimplemented MAP_INHERIT */
@@ -67,7 +67,7 @@
 #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.  */
@@ -101,7 +101,7 @@
 					   space.  */
 
 /* Flags for 'minherit'.  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define INHERIT_SHARE	0
 # define INHERIT_COPY	1
 # define INHERIT_NONE	2
@@ -119,7 +119,7 @@
 #define	MINCORE_MODIFIED_OTHER	0x10 /* Page has been modified */
 #endif /* Use MISC */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 
 __BEGIN_DECLS
 

Modified: trunk/glibc-ports/kfreebsd/bits/poll.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/poll.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/poll.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -35,7 +35,7 @@
 # define POLLWRBAND	0x0100		/* Priority data may be written.  */
 #endif
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /* General FreeBSD extension (currently only supported for sockets): */
 # define POLLINIGNEOF	0x2000		/* like POLLIN, except ignore EOF */
 #endif
@@ -47,7 +47,7 @@
 #define POLLHUP		0x0010		/* Hung up.  */
 #define POLLNVAL	0x0020		/* Invalid polling request.  */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 
 # define POLLSTANDARD	(POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
 			POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)

Modified: trunk/glibc-ports/kfreebsd/bits/sem.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/sem.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/sem.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -34,7 +34,7 @@
 #define SETVAL		8		/* set semval */
 #define SETALL		9		/* set all semval's */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define SEM_R		IPC_R		/* read permission for user */
 # define SEM_A		IPC_W		/* alter permission for user */
 #endif

Modified: trunk/glibc-ports/kfreebsd/bits/shm.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/shm.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/shm.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -23,7 +23,7 @@
 #include <bits/types.h>
 
 /* Permission flag for shmget.  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define SHM_R		IPC_R		/* read permission for user */
 # define SHM_W		IPC_W		/* write permission for user */
 #endif

Modified: trunk/glibc-ports/kfreebsd/bits/socket.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/socket.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/socket.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -403,7 +403,7 @@
 #define	INADDR_PFSYNC_GROUP	(u_int32_t)0xe00000f0	/* 224.0.0.240 */
 #define	INADDR_ALLMDNS_GROUP	(u_int32_t)0xe00000fb	/* 224.0.0.251 */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 
 struct sf_hdtr;
 

Modified: trunk/glibc-ports/kfreebsd/bits/stat.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/stat.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/stat.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -173,7 +173,7 @@
 #define __S_IWRITE	0200	/* Write by owner.  */
 #define __S_IEXEC	0100	/* Execute by owner.  */
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 
 /* Definitions of flags stored in file flags word.  */
 
@@ -214,6 +214,6 @@
 
 __END_DECLS
 
-#endif /* __USE_BSD */
+#endif /* __USE_MISC */
 
 #endif /* bits/stat.h */

Modified: trunk/glibc-ports/kfreebsd/bits/sys_errlist.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/sys_errlist.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/sys_errlist.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -23,7 +23,7 @@
 
 /* sys_errlist and sys_nerr are deprecated.  Use strerror instead.  */
 
-#ifdef  __USE_BSD
+#ifdef  __USE_MISC
 extern int sys_nerr;
 extern __const char *__const sys_errlist[];
 #endif

Modified: trunk/glibc-ports/kfreebsd/bits/termios.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/termios.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/termios.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -24,7 +24,7 @@
 /* These macros are also defined in some <bits/ioctls.h> files (with
    numerically identical values), but this serves to shut up cpp's
    complaining. */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 
 # ifdef MDMBUF
 #  undef MDMBUF
@@ -36,7 +36,7 @@
 #  undef PENDIN
 # endif
 
-#endif /* __USE_BSD */
+#endif /* __USE_MISC */
 
 #ifdef ECHO
 # undef ECHO
@@ -77,13 +77,13 @@
 #define VWERASE 4
 #define VKILL 5
 #define VREPRINT 6
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define VERASE2 7
 #endif
 #define VINTR 8
 #define VQUIT 9
 #define VSUSP 10
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define VDSUSP 11
 #endif
 #define VSTART 12
@@ -92,7 +92,7 @@
 #define VDISCARD 15
 #define VMIN 16
 #define VTIME 17
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define VSTATUS 18
 #endif
 
@@ -121,7 +121,7 @@
 # define OXTABS	TAB3
 # define XTABS	TAB3
 #endif
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define ONOEOT	(1 << 3)	/* Discard EOT (^D) on output.  */
 #endif
 #define	OCRNL	(1 << 4)	/* map CR to NL on output */
@@ -129,7 +129,7 @@
 #define	ONLRET	(1 << 6)	/* NL performs CR function */
 
 /* c_cflag bit meaning */
-#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).  */
@@ -143,7 +143,7 @@
 #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 CCTS_OFLOW	(1 << 16)	/* CTS flow control of output.  */
 # define CRTS_IFLOW	(1 << 17)	/* RTS flow control of input.  */
 # define CRTSCTS	(CCTS_OFLOW|CRTS_IFLOW)	/* CTS/RTS flow control.  */
@@ -154,7 +154,7 @@
 #endif
 
 /* c_lflag bits */
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define ECHOKE	(1 << 0)	/* Visual erase for KILL.  */
 #endif
 #define	_ECHOE	(1 << 1)	/* Visual erase for ERASE.  */
@@ -165,7 +165,7 @@
 #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
@@ -173,7 +173,7 @@
 #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.  */
@@ -182,7 +182,7 @@
 #define EXTPROC	_EXTPROC
 #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).  */
@@ -247,7 +247,7 @@
 #define	TCSANOW		0
 #define	TCSADRAIN	1
 #define	TCSAFLUSH	2
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 # define TCSASOFT	0x10	/* Flag: Don't alter hardware state.  */
 #endif
 

Modified: trunk/glibc-ports/kfreebsd/bits/time.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/time.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/time.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -45,7 +45,7 @@
 /* Monotonic system-wide clock.  */
 #   define CLOCK_MONOTONIC		4
 /* These are BSD specific clocks.  */
-#   ifdef __USE_BSD
+#   ifdef __USE_MISC
 #    define CLOCK_VIRTUAL		1
 #    define CLOCK_PROF			2
 #    define CLOCK_UPTIME    5               /* FreeBSD-specific. */
@@ -61,7 +61,7 @@
 #   define CLOCK_THREAD_CPUTIME_ID	14
 /* High-resolution timer from the CPU.  */
 #   define CLOCK_PROCESS_CPUTIME_ID	15
-#   ifdef __USE_BSD
+#   ifdef __USE_MISC
 #     define CPUCLOCK_WHICH_PID 0
 #     define CPUCLOCK_WHICH_TID 1
 #   endif

Modified: trunk/glibc-ports/kfreebsd/bits/uio.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/uio.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/uio.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -41,7 +41,7 @@
    uses a single read() or write() call to guarantee atomicity.  */
 #define UIO_MAXIOV	1024
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 enum    uio_rw { UIO_READ, UIO_WRITE };
 
 /* Segment flag values. */

Modified: trunk/glibc-ports/kfreebsd/bits/waitflags.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/waitflags.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/waitflags.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -35,13 +35,13 @@
                                    a breakpoint. */
                                    
 #define __WCLONE	0x80000000	/* Wait for cloned process.  */
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 # define WLINUXCLONE	__WCLONE	/* FreeBSD name for __WCLONE.  */
 #endif
 
 
 /* The following values are used by the `waitid' function.  */
-#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8
+#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8
 # ifndef __ENUM_IDTYPE_T
 # define __ENUM_IDTYPE_T 1
 
@@ -75,7 +75,7 @@
         P_PSETID                /* Processor set identifier. */
 } idtype_t;                     /* The type of id_t we are using. */
 
-#  if defined __USE_BSD
+#  if defined __USE_MISC
 #  define P_ZONEID        P_JAILID
 #  endif
 # endif

Modified: trunk/glibc-ports/kfreebsd/bits/waitstatus.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/waitstatus.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/bits/waitstatus.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -56,7 +56,7 @@
 
 
 
-#ifdef	__USE_BSD
+#ifdef	__USE_MISC
 
 # include <endian.h>
 

Modified: trunk/glibc-ports/kfreebsd/netinet/if_ether.h
===================================================================
--- trunk/glibc-ports/kfreebsd/netinet/if_ether.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/netinet/if_ether.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -25,7 +25,7 @@
 #include <sys/kglue/sys/types.h>
 #include <net/if_ether.h>
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -134,6 +134,6 @@
 }
 
 __END_DECLS
-#endif /* __USE_BSD */
+#endif /* __USE_MISC */
 
 #endif /* netinet/if_ether.h */

Modified: trunk/glibc-ports/kfreebsd/netinet/ip_icmp.h
===================================================================
--- trunk/glibc-ports/kfreebsd/netinet/ip_icmp.h	2015-10-19 21:22:04 UTC (rev 5779)
+++ trunk/glibc-ports/kfreebsd/netinet/ip_icmp.h	2015-10-19 22:14:19 UTC (rev 5780)
@@ -91,7 +91,7 @@
 #define ICMP_EXC_FRAGTIME	1	/* Fragment Reass time exceeded	*/
 
 
-#ifdef __USE_BSD
+#ifdef __USE_MISC
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -289,7 +289,7 @@
 	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
 	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
 
-#endif /* __USE_BSD */
+#endif /* __USE_MISC */
 
 __END_DECLS
 




More information about the Glibc-bsd-commits mailing list