patches/glibc/ports-2.10.1/550-alpha-fix-SOCK_NONBLOCK.patch
changeset 1625 fde082da9813
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/glibc/ports-2.10.1/550-alpha-fix-SOCK_NONBLOCK.patch	Fri Nov 13 21:37:18 2009 +0100
     1.3 @@ -0,0 +1,417 @@
     1.4 +2009-08-16  Aurelien Jarno  <aurelien@aurel32.net>
     1.5 +
     1.6 +	* ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h: New file based on
     1.7 +	the generic version, with SOCK_NONBLOCK matching the kernel value.
     1.8 +
     1.9 +diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h
    1.10 +--- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h	1970-01-01 01:00:00.000000000 +0100
    1.11 ++++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h	2009-11-13 00:51:17.000000000 +0100
    1.12 +@@ -0,0 +1,407 @@
    1.13 ++/* System-specific socket constants and types.  Linux version.
    1.14 ++   Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009
    1.15 ++   Free Software Foundation, Inc.
    1.16 ++   This file is part of the GNU C Library.
    1.17 ++
    1.18 ++   The GNU C Library is free software; you can redistribute it and/or
    1.19 ++   modify it under the terms of the GNU Lesser General Public
    1.20 ++   License as published by the Free Software Foundation; either
    1.21 ++   version 2.1 of the License, or (at your option) any later version.
    1.22 ++
    1.23 ++   The GNU C Library is distributed in the hope that it will be useful,
    1.24 ++   but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.25 ++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    1.26 ++   Lesser General Public License for more details.
    1.27 ++
    1.28 ++   You should have received a copy of the GNU Lesser General Public
    1.29 ++   License along with the GNU C Library; if not, write to the Free
    1.30 ++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    1.31 ++   02111-1307 USA.  */
    1.32 ++
    1.33 ++#ifndef __BITS_SOCKET_H
    1.34 ++#define __BITS_SOCKET_H
    1.35 ++
    1.36 ++#ifndef _SYS_SOCKET_H
    1.37 ++# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
    1.38 ++#endif
    1.39 ++
    1.40 ++#define	__need_size_t
    1.41 ++#include <stddef.h>
    1.42 ++
    1.43 ++#include <sys/types.h>
    1.44 ++
    1.45 ++/* Type for length arguments in socket calls.  */
    1.46 ++#ifndef __socklen_t_defined
    1.47 ++typedef __socklen_t socklen_t;
    1.48 ++# define __socklen_t_defined
    1.49 ++#endif
    1.50 ++
    1.51 ++/* Types of sockets.  */
    1.52 ++enum __socket_type
    1.53 ++{
    1.54 ++  SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
    1.55 ++				   byte streams.  */
    1.56 ++#define SOCK_STREAM SOCK_STREAM
    1.57 ++  SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
    1.58 ++				   of fixed maximum length.  */
    1.59 ++#define SOCK_DGRAM SOCK_DGRAM
    1.60 ++  SOCK_RAW = 3,			/* Raw protocol interface.  */
    1.61 ++#define SOCK_RAW SOCK_RAW
    1.62 ++  SOCK_RDM = 4,			/* Reliably-delivered messages.  */
    1.63 ++#define SOCK_RDM SOCK_RDM
    1.64 ++  SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
    1.65 ++				   datagrams of fixed maximum length.  */
    1.66 ++#define SOCK_SEQPACKET SOCK_SEQPACKET
    1.67 ++  SOCK_DCCP = 6,		/* Datagram Congestion Control Protocol.  */
    1.68 ++#define SOCK_DCCP SOCK_DCCP
    1.69 ++  SOCK_PACKET = 10,		/* Linux specific way of getting packets
    1.70 ++				   at the dev level.  For writing rarp and
    1.71 ++				   other similar things on the user level. */
    1.72 ++#define SOCK_PACKET SOCK_PACKET
    1.73 ++
    1.74 ++  /* Flags to be ORed into the type parameter of socket and socketpair and
    1.75 ++     used for the flags parameter of paccept.  */
    1.76 ++
    1.77 ++  SOCK_CLOEXEC = 02000000,	/* Atomically set close-on-exec flag for the
    1.78 ++				   new descriptor(s).  */
    1.79 ++#define SOCK_CLOEXEC SOCK_CLOEXEC
    1.80 ++#undef SOCK_NONBLOCK
    1.81 ++  SOCK_NONBLOCK = 0x40000000	/* Atomically mark descriptor(s) as
    1.82 ++				   non-blocking.  */
    1.83 ++#define SOCK_NONBLOCK SOCK_NONBLOCK
    1.84 ++};
    1.85 ++
    1.86 ++/* Protocol families.  */
    1.87 ++#define	PF_UNSPEC	0	/* Unspecified.  */
    1.88 ++#define	PF_LOCAL	1	/* Local to host (pipes and file-domain).  */
    1.89 ++#define	PF_UNIX		PF_LOCAL /* POSIX name for PF_LOCAL.  */
    1.90 ++#define	PF_FILE		PF_LOCAL /* Another non-standard name for PF_LOCAL.  */
    1.91 ++#define	PF_INET		2	/* IP protocol family.  */
    1.92 ++#define	PF_AX25		3	/* Amateur Radio AX.25.  */
    1.93 ++#define	PF_IPX		4	/* Novell Internet Protocol.  */
    1.94 ++#define	PF_APPLETALK	5	/* Appletalk DDP.  */
    1.95 ++#define	PF_NETROM	6	/* Amateur radio NetROM.  */
    1.96 ++#define	PF_BRIDGE	7	/* Multiprotocol bridge.  */
    1.97 ++#define	PF_ATMPVC	8	/* ATM PVCs.  */
    1.98 ++#define	PF_X25		9	/* Reserved for X.25 project.  */
    1.99 ++#define	PF_INET6	10	/* IP version 6.  */
   1.100 ++#define	PF_ROSE		11	/* Amateur Radio X.25 PLP.  */
   1.101 ++#define	PF_DECnet	12	/* Reserved for DECnet project.  */
   1.102 ++#define	PF_NETBEUI	13	/* Reserved for 802.2LLC project.  */
   1.103 ++#define	PF_SECURITY	14	/* Security callback pseudo AF.  */
   1.104 ++#define	PF_KEY		15	/* PF_KEY key management API.  */
   1.105 ++#define	PF_NETLINK	16
   1.106 ++#define	PF_ROUTE	PF_NETLINK /* Alias to emulate 4.4BSD.  */
   1.107 ++#define	PF_PACKET	17	/* Packet family.  */
   1.108 ++#define	PF_ASH		18	/* Ash.  */
   1.109 ++#define	PF_ECONET	19	/* Acorn Econet.  */
   1.110 ++#define	PF_ATMSVC	20	/* ATM SVCs.  */
   1.111 ++#define PF_RDS		21	/* RDS sockets.  */
   1.112 ++#define	PF_SNA		22	/* Linux SNA Project */
   1.113 ++#define	PF_IRDA		23	/* IRDA sockets.  */
   1.114 ++#define	PF_PPPOX	24	/* PPPoX sockets.  */
   1.115 ++#define	PF_WANPIPE	25	/* Wanpipe API sockets.  */
   1.116 ++#define PF_LLC		26	/* Linux LLC.  */
   1.117 ++#define PF_CAN		29	/* Controller Area Network.  */
   1.118 ++#define PF_TIPC		30	/* TIPC sockets.  */
   1.119 ++#define	PF_BLUETOOTH	31	/* Bluetooth sockets.  */
   1.120 ++#define	PF_IUCV		32	/* IUCV sockets.  */
   1.121 ++#define PF_RXRPC	33	/* RxRPC sockets.  */
   1.122 ++#define PF_ISDN		34	/* mISDN sockets.  */
   1.123 ++#define PF_PHONET	35	/* Phonet sockets.  */
   1.124 ++#define PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
   1.125 ++#define	PF_MAX		37	/* For now..  */
   1.126 ++
   1.127 ++/* Address families.  */
   1.128 ++#define	AF_UNSPEC	PF_UNSPEC
   1.129 ++#define	AF_LOCAL	PF_LOCAL
   1.130 ++#define	AF_UNIX		PF_UNIX
   1.131 ++#define	AF_FILE		PF_FILE
   1.132 ++#define	AF_INET		PF_INET
   1.133 ++#define	AF_AX25		PF_AX25
   1.134 ++#define	AF_IPX		PF_IPX
   1.135 ++#define	AF_APPLETALK	PF_APPLETALK
   1.136 ++#define	AF_NETROM	PF_NETROM
   1.137 ++#define	AF_BRIDGE	PF_BRIDGE
   1.138 ++#define	AF_ATMPVC	PF_ATMPVC
   1.139 ++#define	AF_X25		PF_X25
   1.140 ++#define	AF_INET6	PF_INET6
   1.141 ++#define	AF_ROSE		PF_ROSE
   1.142 ++#define	AF_DECnet	PF_DECnet
   1.143 ++#define	AF_NETBEUI	PF_NETBEUI
   1.144 ++#define	AF_SECURITY	PF_SECURITY
   1.145 ++#define	AF_KEY		PF_KEY
   1.146 ++#define	AF_NETLINK	PF_NETLINK
   1.147 ++#define	AF_ROUTE	PF_ROUTE
   1.148 ++#define	AF_PACKET	PF_PACKET
   1.149 ++#define	AF_ASH		PF_ASH
   1.150 ++#define	AF_ECONET	PF_ECONET
   1.151 ++#define	AF_ATMSVC	PF_ATMSVC
   1.152 ++#define AF_RDS		PF_RDS
   1.153 ++#define	AF_SNA		PF_SNA
   1.154 ++#define	AF_IRDA		PF_IRDA
   1.155 ++#define	AF_PPPOX	PF_PPPOX
   1.156 ++#define	AF_WANPIPE	PF_WANPIPE
   1.157 ++#define AF_LLC		PF_LLC
   1.158 ++#define AF_CAN		PF_CAN
   1.159 ++#define AF_TIPC		PF_TIPC
   1.160 ++#define	AF_BLUETOOTH	PF_BLUETOOTH
   1.161 ++#define	AF_IUCV		PF_IUCV
   1.162 ++#define AF_RXRPC	PF_RXRPC
   1.163 ++#define AF_ISDN		PF_ISDN
   1.164 ++#define AF_PHONET	PF_PHONET
   1.165 ++#define AF_IEEE802154	PF_IEEE802154
   1.166 ++#define	AF_MAX		PF_MAX
   1.167 ++
   1.168 ++/* Socket level values.  Others are defined in the appropriate headers.
   1.169 ++
   1.170 ++   XXX These definitions also should go into the appropriate headers as
   1.171 ++   far as they are available.  */
   1.172 ++#define SOL_RAW		255
   1.173 ++#define SOL_DECNET      261
   1.174 ++#define SOL_X25         262
   1.175 ++#define SOL_PACKET	263
   1.176 ++#define SOL_ATM		264	/* ATM layer (cell level).  */
   1.177 ++#define SOL_AAL		265	/* ATM Adaption Layer (packet level).  */
   1.178 ++#define SOL_IRDA	266
   1.179 ++
   1.180 ++/* Maximum queue length specifiable by listen.  */
   1.181 ++#define SOMAXCONN	128
   1.182 ++
   1.183 ++/* Get the definition of the macro to define the common sockaddr members.  */
   1.184 ++#include <bits/sockaddr.h>
   1.185 ++
   1.186 ++/* Structure describing a generic socket address.  */
   1.187 ++struct sockaddr
   1.188 ++  {
   1.189 ++    __SOCKADDR_COMMON (sa_);	/* Common data: address family and length.  */
   1.190 ++    char sa_data[14];		/* Address data.  */
   1.191 ++  };
   1.192 ++
   1.193 ++
   1.194 ++/* Structure large enough to hold any socket address (with the historical
   1.195 ++   exception of AF_UNIX).  We reserve 128 bytes.  */
   1.196 ++#define __ss_aligntype	unsigned long int
   1.197 ++#define _SS_SIZE	128
   1.198 ++#define _SS_PADSIZE	(_SS_SIZE - (2 * sizeof (__ss_aligntype)))
   1.199 ++
   1.200 ++struct sockaddr_storage
   1.201 ++  {
   1.202 ++    __SOCKADDR_COMMON (ss_);	/* Address family, etc.  */
   1.203 ++    __ss_aligntype __ss_align;	/* Force desired alignment.  */
   1.204 ++    char __ss_padding[_SS_PADSIZE];
   1.205 ++  };
   1.206 ++
   1.207 ++
   1.208 ++/* Bits in the FLAGS argument to `send', `recv', et al.  */
   1.209 ++enum
   1.210 ++  {
   1.211 ++    MSG_OOB		= 0x01,	/* Process out-of-band data.  */
   1.212 ++#define MSG_OOB		MSG_OOB
   1.213 ++    MSG_PEEK		= 0x02,	/* Peek at incoming messages.  */
   1.214 ++#define MSG_PEEK	MSG_PEEK
   1.215 ++    MSG_DONTROUTE	= 0x04,	/* Don't use local routing.  */
   1.216 ++#define MSG_DONTROUTE	MSG_DONTROUTE
   1.217 ++#ifdef __USE_GNU
   1.218 ++    /* DECnet uses a different name.  */
   1.219 ++    MSG_TRYHARD		= MSG_DONTROUTE,
   1.220 ++# define MSG_TRYHARD	MSG_DONTROUTE
   1.221 ++#endif
   1.222 ++    MSG_CTRUNC		= 0x08,	/* Control data lost before delivery.  */
   1.223 ++#define MSG_CTRUNC	MSG_CTRUNC
   1.224 ++    MSG_PROXY		= 0x10,	/* Supply or ask second address.  */
   1.225 ++#define MSG_PROXY	MSG_PROXY
   1.226 ++    MSG_TRUNC		= 0x20,
   1.227 ++#define	MSG_TRUNC	MSG_TRUNC
   1.228 ++    MSG_DONTWAIT	= 0x40, /* Nonblocking IO.  */
   1.229 ++#define	MSG_DONTWAIT	MSG_DONTWAIT
   1.230 ++    MSG_EOR		= 0x80, /* End of record.  */
   1.231 ++#define	MSG_EOR		MSG_EOR
   1.232 ++    MSG_WAITALL		= 0x100, /* Wait for a full request.  */
   1.233 ++#define	MSG_WAITALL	MSG_WAITALL
   1.234 ++    MSG_FIN		= 0x200,
   1.235 ++#define	MSG_FIN		MSG_FIN
   1.236 ++    MSG_SYN		= 0x400,
   1.237 ++#define	MSG_SYN		MSG_SYN
   1.238 ++    MSG_CONFIRM		= 0x800, /* Confirm path validity.  */
   1.239 ++#define	MSG_CONFIRM	MSG_CONFIRM
   1.240 ++    MSG_RST		= 0x1000,
   1.241 ++#define	MSG_RST		MSG_RST
   1.242 ++    MSG_ERRQUEUE	= 0x2000, /* Fetch message from error queue.  */
   1.243 ++#define	MSG_ERRQUEUE	MSG_ERRQUEUE
   1.244 ++    MSG_NOSIGNAL	= 0x4000, /* Do not generate SIGPIPE.  */
   1.245 ++#define	MSG_NOSIGNAL	MSG_NOSIGNAL
   1.246 ++    MSG_MORE		= 0x8000,  /* Sender will send more.  */
   1.247 ++#define	MSG_MORE	MSG_MORE
   1.248 ++
   1.249 ++    MSG_CMSG_CLOEXEC	= 0x40000000	/* Set close_on_exit for file
   1.250 ++                                           descriptor received through
   1.251 ++                                           SCM_RIGHTS.  */
   1.252 ++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
   1.253 ++  };
   1.254 ++
   1.255 ++
   1.256 ++/* Structure describing messages sent by
   1.257 ++   `sendmsg' and received by `recvmsg'.  */
   1.258 ++struct msghdr
   1.259 ++  {
   1.260 ++    void *msg_name;		/* Address to send to/receive from.  */
   1.261 ++    socklen_t msg_namelen;	/* Length of address data.  */
   1.262 ++
   1.263 ++    struct iovec *msg_iov;	/* Vector of data to send/receive into.  */
   1.264 ++    size_t msg_iovlen;		/* Number of elements in the vector.  */
   1.265 ++
   1.266 ++    void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
   1.267 ++    size_t msg_controllen;	/* Ancillary data buffer length.
   1.268 ++				   !! The type should be socklen_t but the
   1.269 ++				   definition of the kernel is incompatible
   1.270 ++				   with this.  */
   1.271 ++
   1.272 ++    int msg_flags;		/* Flags on received message.  */
   1.273 ++  };
   1.274 ++
   1.275 ++/* Structure used for storage of ancillary data object information.  */
   1.276 ++struct cmsghdr
   1.277 ++  {
   1.278 ++    size_t cmsg_len;		/* Length of data in cmsg_data plus length
   1.279 ++				   of cmsghdr structure.
   1.280 ++				   !! The type should be socklen_t but the
   1.281 ++				   definition of the kernel is incompatible
   1.282 ++				   with this.  */
   1.283 ++    int cmsg_level;		/* Originating protocol.  */
   1.284 ++    int cmsg_type;		/* Protocol specific type.  */
   1.285 ++#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
   1.286 ++    __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data.  */
   1.287 ++#endif
   1.288 ++  };
   1.289 ++
   1.290 ++/* Ancillary data object manipulation macros.  */
   1.291 ++#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
   1.292 ++# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
   1.293 ++#else
   1.294 ++# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
   1.295 ++#endif
   1.296 ++#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
   1.297 ++#define CMSG_FIRSTHDR(mhdr) \
   1.298 ++  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
   1.299 ++   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
   1.300 ++#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
   1.301 ++			 & (size_t) ~(sizeof (size_t) - 1))
   1.302 ++#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
   1.303 ++			 + CMSG_ALIGN (sizeof (struct cmsghdr)))
   1.304 ++#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
   1.305 ++
   1.306 ++extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
   1.307 ++				      struct cmsghdr *__cmsg) __THROW;
   1.308 ++#ifdef __USE_EXTERN_INLINES
   1.309 ++# ifndef _EXTERN_INLINE
   1.310 ++#  define _EXTERN_INLINE __extern_inline
   1.311 ++# endif
   1.312 ++_EXTERN_INLINE struct cmsghdr *
   1.313 ++__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
   1.314 ++{
   1.315 ++  if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
   1.316 ++    /* The kernel header does this so there may be a reason.  */
   1.317 ++    return 0;
   1.318 ++
   1.319 ++  __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
   1.320 ++			       + CMSG_ALIGN (__cmsg->cmsg_len));
   1.321 ++  if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control
   1.322 ++					+ __mhdr->msg_controllen)
   1.323 ++      || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
   1.324 ++	  > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
   1.325 ++    /* No more entries.  */
   1.326 ++    return 0;
   1.327 ++  return __cmsg;
   1.328 ++}
   1.329 ++#endif	/* Use `extern inline'.  */
   1.330 ++
   1.331 ++/* Socket level message types.  This must match the definitions in
   1.332 ++   <linux/socket.h>.  */
   1.333 ++enum
   1.334 ++  {
   1.335 ++    SCM_RIGHTS = 0x01		/* Transfer file descriptors.  */
   1.336 ++#define SCM_RIGHTS SCM_RIGHTS
   1.337 ++#ifdef __USE_GNU
   1.338 ++    , SCM_CREDENTIALS = 0x02	/* Credentials passing.  */
   1.339 ++# define SCM_CREDENTIALS SCM_CREDENTIALS
   1.340 ++#endif
   1.341 ++  };
   1.342 ++
   1.343 ++#ifdef __USE_GNU
   1.344 ++/* User visible structure for SCM_CREDENTIALS message */
   1.345 ++struct ucred
   1.346 ++{
   1.347 ++  pid_t pid;			/* PID of sending process.  */
   1.348 ++  uid_t uid;			/* UID of sending process.  */
   1.349 ++  gid_t gid;			/* GID of sending process.  */
   1.350 ++};
   1.351 ++#endif
   1.352 ++
   1.353 ++/* Ugly workaround for unclean kernel headers.  */
   1.354 ++#if !defined __USE_MISC && !defined __USE_GNU
   1.355 ++# ifndef FIOGETOWN
   1.356 ++#  define __SYS_SOCKET_H_undef_FIOGETOWN
   1.357 ++# endif
   1.358 ++# ifndef FIOSETOWN
   1.359 ++#  define __SYS_SOCKET_H_undef_FIOSETOWN
   1.360 ++# endif
   1.361 ++# ifndef SIOCATMARK
   1.362 ++#  define __SYS_SOCKET_H_undef_SIOCATMARK
   1.363 ++# endif
   1.364 ++# ifndef SIOCGPGRP
   1.365 ++#  define __SYS_SOCKET_H_undef_SIOCGPGRP
   1.366 ++# endif
   1.367 ++# ifndef SIOCGSTAMP
   1.368 ++#  define __SYS_SOCKET_H_undef_SIOCGSTAMP
   1.369 ++# endif
   1.370 ++# ifndef SIOCGSTAMPNS
   1.371 ++#  define __SYS_SOCKET_H_undef_SIOCGSTAMPNS
   1.372 ++# endif
   1.373 ++# ifndef SIOCSPGRP
   1.374 ++#  define __SYS_SOCKET_H_undef_SIOCSPGRP
   1.375 ++# endif
   1.376 ++#endif
   1.377 ++
   1.378 ++/* Get socket manipulation related informations from kernel headers.  */
   1.379 ++#include <asm/socket.h>
   1.380 ++
   1.381 ++#if !defined __USE_MISC && !defined __USE_GNU
   1.382 ++# ifdef __SYS_SOCKET_H_undef_FIOGETOWN
   1.383 ++#  undef __SYS_SOCKET_H_undef_FIOGETOWN
   1.384 ++#  undef FIOGETOWN
   1.385 ++# endif
   1.386 ++# ifdef __SYS_SOCKET_H_undef_FIOSETOWN
   1.387 ++#  undef __SYS_SOCKET_H_undef_FIOSETOWN
   1.388 ++#  undef FIOSETOWN
   1.389 ++# endif
   1.390 ++# ifdef __SYS_SOCKET_H_undef_SIOCATMARK
   1.391 ++#  undef __SYS_SOCKET_H_undef_SIOCATMARK
   1.392 ++#  undef SIOCATMARK
   1.393 ++# endif
   1.394 ++# ifdef __SYS_SOCKET_H_undef_SIOCGPGRP
   1.395 ++#  undef __SYS_SOCKET_H_undef_SIOCGPGRP
   1.396 ++#  undef SIOCGPGRP
   1.397 ++# endif
   1.398 ++# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMP
   1.399 ++#  undef __SYS_SOCKET_H_undef_SIOCGSTAMP
   1.400 ++#  undef SIOCGSTAMP
   1.401 ++# endif
   1.402 ++# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMPNS
   1.403 ++#  undef __SYS_SOCKET_H_undef_SIOCGSTAMPNS
   1.404 ++#  undef SIOCGSTAMPNS
   1.405 ++# endif
   1.406 ++# ifdef __SYS_SOCKET_H_undef_SIOCSPGRP
   1.407 ++#  undef __SYS_SOCKET_H_undef_SIOCSPGRP
   1.408 ++#  undef SIOCSPGRP
   1.409 ++# endif
   1.410 ++#endif
   1.411 ++
   1.412 ++/* Structure used to manipulate the SO_LINGER option.  */
   1.413 ++struct linger
   1.414 ++  {
   1.415 ++    int l_onoff;		/* Nonzero to linger on close.  */
   1.416 ++    int l_linger;		/* Time to linger.  */
   1.417 ++  };
   1.418 ++
   1.419 ++#endif	/* bits/socket.h */
   1.420 +diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h