diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/socket.h | 56 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netrose/rose.h | 3 |
5 files changed, 45 insertions, 23 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 582e0a8e7b..c995e45c4c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -94,7 +94,7 @@ cross_compiling=$ac_cv_prog_cc_cross AC_DEFUN(LIBC_PROG_FOO_GNU, [# Most GNU programs take a -v and spit out some text including # the word 'GNU'. Some try to read stdin, so give them /dev/null. -if $1 -v </dev/null 2>&1 | grep -q GNU; then +if $1 -v </dev/null 2>&1 | grep GNU 2>&1 > /dev/null; then $2 else $3 diff --git a/configure b/configure index 7beb9592a6..ef9431df25 100755 --- a/configure +++ b/configure @@ -1545,7 +1545,7 @@ if eval "test \"`echo '$''{'libc_cv_prog_as_gnu'+set}'`\" = set"; then else # Most GNU programs take a -v and spit out some text including # the word 'GNU'. Some try to read stdin, so give them /dev/null. -if $AS -v </dev/null 2>&1 | grep -q GNU; then +if $AS -v </dev/null 2>&1 | grep GNU 2>&1 > /dev/null; then libc_cv_prog_as_gnu=yes else libc_cv_prog_as_gnu=no @@ -1563,7 +1563,7 @@ if eval "test \"`echo '$''{'libc_cv_prog_ld_gnu'+set}'`\" = set"; then else # Most GNU programs take a -v and spit out some text including # the word 'GNU'. Some try to read stdin, so give them /dev/null. -if $LD -v </dev/null 2>&1 | grep -q GNU; then +if $LD -v </dev/null 2>&1 | grep GNU 2>&1 > /dev/null; then libc_cv_prog_ld_gnu=yes else libc_cv_prog_ld_gnu=no diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 0476c15c00..2b3b098926 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -74,6 +74,7 @@ enum __socket_type #define PF_NETLINK 16 #define PF_ROUTE PF_NETLINK /* Alias to emulate 4.4BSD */ #define PF_PACKET 17 /* Packet family */ +#define PF_ASH 18 /* Ash */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -98,6 +99,7 @@ enum __socket_type #define AF_NETLINK PF_NETLINK #define AF_ROUTE PF_ROUTE #define AF_PACKET PF_PACKET +#define AF_ASH PF_ASH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. @@ -107,7 +109,6 @@ enum __socket_type #define SOL_IPV6 41 #define SOL_ICMPV6 58 #define SOL_RAW 255 -#define SOL_ROSE 260 #define SOL_DECNET 261 #define SOL_X25 262 diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h index f56f6269db..f481a478b2 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/socket.h +++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux version. - Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. + Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,21 +30,27 @@ typedef unsigned int socklen_t; /* Supported address families. */ #define PF_UNSPEC 0 -#define PF_UNIX 1 /* Unix domain sockets */ -#define PF_LOCAL 1 /* POSIX name for AF_UNIX */ -#define PF_FILE PF_LOCAL /* POSIX name for PF_LOCAL. */ -#define PF_INET 2 /* Internet IP Protocol */ -#define PF_AX25 3 /* Amateur Radio AX.25 */ -#define PF_IPX 4 /* Novell IPX */ -#define PF_APPLETALK 5 /* Appletalk DDP */ -#define PF_NETROM 6 /* Amateur Radio NET/ROM */ -#define PF_BRIDGE 7 /* Multiprotocol bridge */ -#define PF_AAL5 8 /* Reserved for Werner's ATM */ -#define PF_X25 9 /* Reserved for X.25 project */ -#define PF_INET6 10 /* IP version 6 */ -#define PF_ROSE 11 /* Amateur Radio X.25 PLP */ -#define PF_DECNET 12 /* Reserved for DECnet project */ -#define PF_NETBEUI 13 /* Reserved for 802.2LLC project*/ +#define PF_LOCAL 1 /* Local to host (pipes and file-domain). */ +#define PF_UNIX PF_LOCAL /* Old BSD name for PF_LOCAL. */ +#define PF_FILE PF_LOCAL /* POSIX name for PF_LOCAL. */ +#define PF_INET 2 /* IP protocol family. */ +#define PF_AX25 3 /* Amateur Radio AX.25. */ +#define PF_IPX 4 /* Novell Internet Protocol. */ +#define PF_APPLETALK 5 /* Don't use this. */ +#define PF_NETROM 6 /* Amateur radio NetROM. */ +#define PF_BRIDGE 7 /* Multiprotocol bridge. */ +#define PF_AAL5 8 /* Reserved for Werner's ATM. */ +#define PF_X25 9 /* Reserved for X.25 project. */ +#define PF_INET6 10 /* IP version 6. */ +#define PF_ROSE 11 /* Amateur Radio X.25 PLP */ +#define PF_DECnet 12 /* Reserved for DECnet project */ +#define PF_NETBEUI 13 /* Reserved for 802.2LLC project*/ +#define PF_SECURITY 14 /* Security callback pseudo AF */ +#define PF_KEY 15 /* PF_KEY key management API */ +#define PF_NETLINK 16 +#define PF_ROUTE PF_NETLINK /* Alias to emulate 4.4BSD */ +#define PF_PACKET 17 /* Packet family */ +#define PF_ASH 18 /* Ash */ #define PF_MAX 32 /* For now.. */ /* Protocol families, same as address families. */ @@ -52,7 +58,7 @@ typedef unsigned int socklen_t; #define AF_UNIX PF_UNIX #define AF_LOCAL PF_LOCAL #define AF_FILE PF_FILE -#define AF_INET PF_INET + #define AF_AX25 PF_AX25 #define AF_IPX PF_IPX #define AF_APPLETALK PF_APPLETALK @@ -64,11 +70,23 @@ typedef unsigned int socklen_t; #define AF_ROSE PF_ROSE #define AF_DECNET PF_DECNET #define AF_NETBEUI PF_NETBEUI - +#define AF_SECURITY PF_SECURITY +#define pseudo_AF_KEY PF_KEY +#define AF_NETLINK PF_NETLINK +#define AF_ROUTE PF_ROUTE +#define AF_PACKET PF_PACKET +#define AF_ASH PF_ASH #define AF_MAX PF_MAX -/* Raw IP packet level. */ +/* Socket level values. Others are defined in the appropriate headers. + + XXX These definitions also should go into the appropriate headers as + far as they are available. */ +#define SOL_IPV6 41 +#define SOL_ICMPV6 58 #define SOL_RAW 255 +#define SOL_DECNET 261 +#define SOL_X25 262 /* Maximum queue length specifiable by listen. */ #define SOMAXCONN 128 diff --git a/sysdeps/unix/sysv/linux/netrose/rose.h b/sysdeps/unix/sysv/linux/netrose/rose.h index c158c66bb7..f861b8854e 100644 --- a/sysdeps/unix/sysv/linux/netrose/rose.h +++ b/sysdeps/unix/sysv/linux/netrose/rose.h @@ -22,4 +22,7 @@ #include <linux/rose.h> /* Ask, and the kernel will provide. */ +/* Socket level values. */ +#define SOL_ROSE 260 + #endif |