1 |
vapier 10/09/29 23:52:50 |
2 |
|
3 |
Added: 6030_all_alpha-fix-SOCK_NONBLOCK.patch |
4 |
6031_all_alpha-glibc-2.12-epoll_create1.patch |
5 |
Removed: 6028_all_alpha-fix-SOCK_NONBLOCK.patch |
6 |
6029_all_alpha-glibc-2.12-epoll_create1.patch |
7 |
Log: |
8 |
rename new alpha patches to make way for more memchr fixes |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 src/patchsets/glibc/2.12.1/ports/6030_all_alpha-fix-SOCK_NONBLOCK.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.12.1/ports/6030_all_alpha-fix-SOCK_NONBLOCK.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.12.1/ports/6030_all_alpha-fix-SOCK_NONBLOCK.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: 6030_all_alpha-fix-SOCK_NONBLOCK.patch |
17 |
=================================================================== |
18 |
2010-02-13 Aurelien Jarno <aurelien@×××××××.net> |
19 |
|
20 |
* sysdeps/unix/sysv/linux/alpha/bits/socket.h: New file based on |
21 |
the generic version, with SOCK_CLOEXEC and SOCK_NONBLOCK |
22 |
matching the kernel value. |
23 |
|
24 |
--- /dev/null |
25 |
+++ ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h |
26 |
@@ -0,0 +1,407 @@ |
27 |
+/* System-specific socket constants and types. Linux version. |
28 |
+ Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009 |
29 |
+ Free Software Foundation, Inc. |
30 |
+ This file is part of the GNU C Library. |
31 |
+ |
32 |
+ The GNU C Library is free software; you can redistribute it and/or |
33 |
+ modify it under the terms of the GNU Lesser General Public |
34 |
+ License as published by the Free Software Foundation; either |
35 |
+ version 2.1 of the License, or (at your option) any later version. |
36 |
+ |
37 |
+ The GNU C Library is distributed in the hope that it will be useful, |
38 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of |
39 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
40 |
+ Lesser General Public License for more details. |
41 |
+ |
42 |
+ You should have received a copy of the GNU Lesser General Public |
43 |
+ License along with the GNU C Library; if not, write to the Free |
44 |
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA |
45 |
+ 02111-1307 USA. */ |
46 |
+ |
47 |
+#ifndef __BITS_SOCKET_H |
48 |
+#define __BITS_SOCKET_H |
49 |
+ |
50 |
+#ifndef _SYS_SOCKET_H |
51 |
+# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead." |
52 |
+#endif |
53 |
+ |
54 |
+#define __need_size_t |
55 |
+#include <stddef.h> |
56 |
+ |
57 |
+#include <sys/types.h> |
58 |
+ |
59 |
+/* Type for length arguments in socket calls. */ |
60 |
+#ifndef __socklen_t_defined |
61 |
+typedef __socklen_t socklen_t; |
62 |
+# define __socklen_t_defined |
63 |
+#endif |
64 |
+ |
65 |
+/* Types of sockets. */ |
66 |
+enum __socket_type |
67 |
+{ |
68 |
+ SOCK_STREAM = 1, /* Sequenced, reliable, connection-based |
69 |
+ byte streams. */ |
70 |
+#define SOCK_STREAM SOCK_STREAM |
71 |
+ SOCK_DGRAM = 2, /* Connectionless, unreliable datagrams |
72 |
+ of fixed maximum length. */ |
73 |
+#define SOCK_DGRAM SOCK_DGRAM |
74 |
+ SOCK_RAW = 3, /* Raw protocol interface. */ |
75 |
+#define SOCK_RAW SOCK_RAW |
76 |
+ SOCK_RDM = 4, /* Reliably-delivered messages. */ |
77 |
+#define SOCK_RDM SOCK_RDM |
78 |
+ SOCK_SEQPACKET = 5, /* Sequenced, reliable, connection-based, |
79 |
+ datagrams of fixed maximum length. */ |
80 |
+#define SOCK_SEQPACKET SOCK_SEQPACKET |
81 |
+ SOCK_DCCP = 6, /* Datagram Congestion Control Protocol. */ |
82 |
+#define SOCK_DCCP SOCK_DCCP |
83 |
+ SOCK_PACKET = 10, /* Linux specific way of getting packets |
84 |
+ at the dev level. For writing rarp and |
85 |
+ other similar things on the user level. */ |
86 |
+#define SOCK_PACKET SOCK_PACKET |
87 |
+ |
88 |
+ /* Flags to be ORed into the type parameter of socket and socketpair and |
89 |
+ used for the flags parameter of paccept. */ |
90 |
+ |
91 |
+ SOCK_CLOEXEC = 010000000, /* Atomically set close-on-exec flag for the |
92 |
+ new descriptor(s). */ |
93 |
+#define SOCK_CLOEXEC SOCK_CLOEXEC |
94 |
+#undef SOCK_NONBLOCK |
95 |
+ SOCK_NONBLOCK = 0x40000000 /* Atomically mark descriptor(s) as |
96 |
+ non-blocking. */ |
97 |
+#define SOCK_NONBLOCK SOCK_NONBLOCK |
98 |
+}; |
99 |
+ |
100 |
+/* Protocol families. */ |
101 |
+#define PF_UNSPEC 0 /* Unspecified. */ |
102 |
+#define PF_LOCAL 1 /* Local to host (pipes and file-domain). */ |
103 |
+#define PF_UNIX PF_LOCAL /* POSIX name for PF_LOCAL. */ |
104 |
+#define PF_FILE PF_LOCAL /* Another non-standard name for PF_LOCAL. */ |
105 |
+#define PF_INET 2 /* IP protocol family. */ |
106 |
+#define PF_AX25 3 /* Amateur Radio AX.25. */ |
107 |
+#define PF_IPX 4 /* Novell Internet Protocol. */ |
108 |
+#define PF_APPLETALK 5 /* Appletalk DDP. */ |
109 |
+#define PF_NETROM 6 /* Amateur radio NetROM. */ |
110 |
+#define PF_BRIDGE 7 /* Multiprotocol bridge. */ |
111 |
+#define PF_ATMPVC 8 /* ATM PVCs. */ |
112 |
+#define PF_X25 9 /* Reserved for X.25 project. */ |
113 |
+#define PF_INET6 10 /* IP version 6. */ |
114 |
+#define PF_ROSE 11 /* Amateur Radio X.25 PLP. */ |
115 |
+#define PF_DECnet 12 /* Reserved for DECnet project. */ |
116 |
+#define PF_NETBEUI 13 /* Reserved for 802.2LLC project. */ |
117 |
+#define PF_SECURITY 14 /* Security callback pseudo AF. */ |
118 |
+#define PF_KEY 15 /* PF_KEY key management API. */ |
119 |
+#define PF_NETLINK 16 |
120 |
+#define PF_ROUTE PF_NETLINK /* Alias to emulate 4.4BSD. */ |
121 |
+#define PF_PACKET 17 /* Packet family. */ |
122 |
+#define PF_ASH 18 /* Ash. */ |
123 |
+#define PF_ECONET 19 /* Acorn Econet. */ |
124 |
+#define PF_ATMSVC 20 /* ATM SVCs. */ |
125 |
+#define PF_RDS 21 /* RDS sockets. */ |
126 |
+#define PF_SNA 22 /* Linux SNA Project */ |
127 |
+#define PF_IRDA 23 /* IRDA sockets. */ |
128 |
+#define PF_PPPOX 24 /* PPPoX sockets. */ |
129 |
+#define PF_WANPIPE 25 /* Wanpipe API sockets. */ |
130 |
+#define PF_LLC 26 /* Linux LLC. */ |
131 |
+#define PF_CAN 29 /* Controller Area Network. */ |
132 |
+#define PF_TIPC 30 /* TIPC sockets. */ |
133 |
+#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ |
134 |
+#define PF_IUCV 32 /* IUCV sockets. */ |
135 |
+#define PF_RXRPC 33 /* RxRPC sockets. */ |
136 |
+#define PF_ISDN 34 /* mISDN sockets. */ |
137 |
+#define PF_PHONET 35 /* Phonet sockets. */ |
138 |
+#define PF_IEEE802154 36 /* IEEE 802.15.4 sockets. */ |
139 |
+#define PF_MAX 37 /* For now.. */ |
140 |
+ |
141 |
+/* Address families. */ |
142 |
+#define AF_UNSPEC PF_UNSPEC |
143 |
+#define AF_LOCAL PF_LOCAL |
144 |
+#define AF_UNIX PF_UNIX |
145 |
+#define AF_FILE PF_FILE |
146 |
+#define AF_INET PF_INET |
147 |
+#define AF_AX25 PF_AX25 |
148 |
+#define AF_IPX PF_IPX |
149 |
+#define AF_APPLETALK PF_APPLETALK |
150 |
+#define AF_NETROM PF_NETROM |
151 |
+#define AF_BRIDGE PF_BRIDGE |
152 |
+#define AF_ATMPVC PF_ATMPVC |
153 |
+#define AF_X25 PF_X25 |
154 |
+#define AF_INET6 PF_INET6 |
155 |
+#define AF_ROSE PF_ROSE |
156 |
+#define AF_DECnet PF_DECnet |
157 |
+#define AF_NETBEUI PF_NETBEUI |
158 |
+#define AF_SECURITY PF_SECURITY |
159 |
+#define AF_KEY PF_KEY |
160 |
+#define AF_NETLINK PF_NETLINK |
161 |
+#define AF_ROUTE PF_ROUTE |
162 |
+#define AF_PACKET PF_PACKET |
163 |
+#define AF_ASH PF_ASH |
164 |
+#define AF_ECONET PF_ECONET |
165 |
+#define AF_ATMSVC PF_ATMSVC |
166 |
+#define AF_RDS PF_RDS |
167 |
+#define AF_SNA PF_SNA |
168 |
+#define AF_IRDA PF_IRDA |
169 |
+#define AF_PPPOX PF_PPPOX |
170 |
+#define AF_WANPIPE PF_WANPIPE |
171 |
+#define AF_LLC PF_LLC |
172 |
+#define AF_CAN PF_CAN |
173 |
+#define AF_TIPC PF_TIPC |
174 |
+#define AF_BLUETOOTH PF_BLUETOOTH |
175 |
+#define AF_IUCV PF_IUCV |
176 |
+#define AF_RXRPC PF_RXRPC |
177 |
+#define AF_ISDN PF_ISDN |
178 |
+#define AF_PHONET PF_PHONET |
179 |
+#define AF_IEEE802154 PF_IEEE802154 |
180 |
+#define AF_MAX PF_MAX |
181 |
+ |
182 |
+/* Socket level values. Others are defined in the appropriate headers. |
183 |
+ |
184 |
+ XXX These definitions also should go into the appropriate headers as |
185 |
+ far as they are available. */ |
186 |
+#define SOL_RAW 255 |
187 |
+#define SOL_DECNET 261 |
188 |
+#define SOL_X25 262 |
189 |
+#define SOL_PACKET 263 |
190 |
+#define SOL_ATM 264 /* ATM layer (cell level). */ |
191 |
+#define SOL_AAL 265 /* ATM Adaption Layer (packet level). */ |
192 |
+#define SOL_IRDA 266 |
193 |
+ |
194 |
+/* Maximum queue length specifiable by listen. */ |
195 |
+#define SOMAXCONN 128 |
196 |
+ |
197 |
+/* Get the definition of the macro to define the common sockaddr members. */ |
198 |
+#include <bits/sockaddr.h> |
199 |
+ |
200 |
+/* Structure describing a generic socket address. */ |
201 |
+struct sockaddr |
202 |
+ { |
203 |
+ __SOCKADDR_COMMON (sa_); /* Common data: address family and length. */ |
204 |
+ char sa_data[14]; /* Address data. */ |
205 |
+ }; |
206 |
+ |
207 |
+ |
208 |
+/* Structure large enough to hold any socket address (with the historical |
209 |
+ exception of AF_UNIX). We reserve 128 bytes. */ |
210 |
+#define __ss_aligntype unsigned long int |
211 |
+#define _SS_SIZE 128 |
212 |
+#define _SS_PADSIZE (_SS_SIZE - (2 * sizeof (__ss_aligntype))) |
213 |
+ |
214 |
+struct sockaddr_storage |
215 |
+ { |
216 |
+ __SOCKADDR_COMMON (ss_); /* Address family, etc. */ |
217 |
+ __ss_aligntype __ss_align; /* Force desired alignment. */ |
218 |
+ char __ss_padding[_SS_PADSIZE]; |
219 |
+ }; |
220 |
+ |
221 |
+ |
222 |
+/* Bits in the FLAGS argument to `send', `recv', et al. */ |
223 |
+enum |
224 |
+ { |
225 |
+ MSG_OOB = 0x01, /* Process out-of-band data. */ |
226 |
+#define MSG_OOB MSG_OOB |
227 |
+ MSG_PEEK = 0x02, /* Peek at incoming messages. */ |
228 |
+#define MSG_PEEK MSG_PEEK |
229 |
+ MSG_DONTROUTE = 0x04, /* Don't use local routing. */ |
230 |
+#define MSG_DONTROUTE MSG_DONTROUTE |
231 |
+#ifdef __USE_GNU |
232 |
+ /* DECnet uses a different name. */ |
233 |
+ MSG_TRYHARD = MSG_DONTROUTE, |
234 |
+# define MSG_TRYHARD MSG_DONTROUTE |
235 |
+#endif |
236 |
+ MSG_CTRUNC = 0x08, /* Control data lost before delivery. */ |
237 |
+#define MSG_CTRUNC MSG_CTRUNC |
238 |
+ MSG_PROXY = 0x10, /* Supply or ask second address. */ |
239 |
+#define MSG_PROXY MSG_PROXY |
240 |
+ MSG_TRUNC = 0x20, |
241 |
+#define MSG_TRUNC MSG_TRUNC |
242 |
+ MSG_DONTWAIT = 0x40, /* Nonblocking IO. */ |
243 |
+#define MSG_DONTWAIT MSG_DONTWAIT |
244 |
+ MSG_EOR = 0x80, /* End of record. */ |
245 |
+#define MSG_EOR MSG_EOR |
246 |
+ MSG_WAITALL = 0x100, /* Wait for a full request. */ |
247 |
+#define MSG_WAITALL MSG_WAITALL |
248 |
+ MSG_FIN = 0x200, |
249 |
+#define MSG_FIN MSG_FIN |
250 |
+ MSG_SYN = 0x400, |
251 |
+#define MSG_SYN MSG_SYN |
252 |
+ MSG_CONFIRM = 0x800, /* Confirm path validity. */ |
253 |
+#define MSG_CONFIRM MSG_CONFIRM |
254 |
+ MSG_RST = 0x1000, |
255 |
+#define MSG_RST MSG_RST |
256 |
+ MSG_ERRQUEUE = 0x2000, /* Fetch message from error queue. */ |
257 |
+#define MSG_ERRQUEUE MSG_ERRQUEUE |
258 |
+ MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */ |
259 |
+#define MSG_NOSIGNAL MSG_NOSIGNAL |
260 |
+ MSG_MORE = 0x8000, /* Sender will send more. */ |
261 |
+#define MSG_MORE MSG_MORE |
262 |
+ |
263 |
+ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file |
264 |
+ descriptor received through |
265 |
+ SCM_RIGHTS. */ |
266 |
+#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC |
267 |
+ }; |
268 |
+ |
269 |
+ |
270 |
+/* Structure describing messages sent by |
271 |
+ `sendmsg' and received by `recvmsg'. */ |
272 |
+struct msghdr |
273 |
+ { |
274 |
+ void *msg_name; /* Address to send to/receive from. */ |
275 |
+ socklen_t msg_namelen; /* Length of address data. */ |
276 |
+ |
277 |
+ struct iovec *msg_iov; /* Vector of data to send/receive into. */ |
278 |
+ size_t msg_iovlen; /* Number of elements in the vector. */ |
279 |
+ |
280 |
+ void *msg_control; /* Ancillary data (eg BSD filedesc passing). */ |
281 |
+ size_t msg_controllen; /* Ancillary data buffer length. |
282 |
+ !! The type should be socklen_t but the |
283 |
+ definition of the kernel is incompatible |
284 |
+ with this. */ |
285 |
+ |
286 |
+ int msg_flags; /* Flags on received message. */ |
287 |
+ }; |
288 |
+ |
289 |
+/* Structure used for storage of ancillary data object information. */ |
290 |
+struct cmsghdr |
291 |
+ { |
292 |
+ size_t cmsg_len; /* Length of data in cmsg_data plus length |
293 |
+ of cmsghdr structure. |
294 |
+ !! The type should be socklen_t but the |
295 |
+ definition of the kernel is incompatible |
296 |
+ with this. */ |
297 |
+ int cmsg_level; /* Originating protocol. */ |
298 |
+ int cmsg_type; /* Protocol specific type. */ |
299 |
+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L |
300 |
+ __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data. */ |
301 |
+#endif |
302 |
+ }; |
303 |
+ |
304 |
+/* Ancillary data object manipulation macros. */ |
305 |
+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L |
306 |
+# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data) |
307 |
+#else |
308 |
+# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1)) |
309 |
+#endif |
310 |
+#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg) |
311 |
+#define CMSG_FIRSTHDR(mhdr) \ |
312 |
+ ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) \ |
313 |
+ ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0) |
314 |
+#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \ |
315 |
+ & (size_t) ~(sizeof (size_t) - 1)) |
316 |
+#define CMSG_SPACE(len) (CMSG_ALIGN (len) \ |
317 |
+ + CMSG_ALIGN (sizeof (struct cmsghdr))) |
318 |
+#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len)) |
319 |
+ |
320 |
+extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr, |
321 |
+ struct cmsghdr *__cmsg) __THROW; |
322 |
+#ifdef __USE_EXTERN_INLINES |
323 |
+# ifndef _EXTERN_INLINE |
324 |
+# define _EXTERN_INLINE __extern_inline |
325 |
+# endif |
326 |
+_EXTERN_INLINE struct cmsghdr * |
327 |
+__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) |
328 |
+{ |
329 |
+ if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr)) |
330 |
+ /* The kernel header does this so there may be a reason. */ |
331 |
+ return 0; |
332 |
+ |
333 |
+ __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg |
334 |
+ + CMSG_ALIGN (__cmsg->cmsg_len)); |
335 |
+ if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control |
336 |
+ + __mhdr->msg_controllen) |
337 |
+ || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len) |
338 |
+ > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen))) |
339 |
+ /* No more entries. */ |
340 |
+ return 0; |
341 |
+ return __cmsg; |
342 |
+} |
343 |
+#endif /* Use `extern inline'. */ |
344 |
+ |
345 |
+/* Socket level message types. This must match the definitions in |
346 |
+ <linux/socket.h>. */ |
347 |
+enum |
348 |
+ { |
349 |
+ SCM_RIGHTS = 0x01 /* Transfer file descriptors. */ |
350 |
+#define SCM_RIGHTS SCM_RIGHTS |
351 |
+#ifdef __USE_GNU |
352 |
+ , SCM_CREDENTIALS = 0x02 /* Credentials passing. */ |
353 |
+# define SCM_CREDENTIALS SCM_CREDENTIALS |
354 |
+#endif |
355 |
+ }; |
356 |
+ |
357 |
+#ifdef __USE_GNU |
358 |
+/* User visible structure for SCM_CREDENTIALS message */ |
359 |
+struct ucred |
360 |
+{ |
361 |
+ pid_t pid; /* PID of sending process. */ |
362 |
+ uid_t uid; /* UID of sending process. */ |
363 |
+ gid_t gid; /* GID of sending process. */ |
364 |
+}; |
365 |
+#endif |
366 |
+ |
367 |
+/* Ugly workaround for unclean kernel headers. */ |
368 |
+#if !defined __USE_MISC && !defined __USE_GNU |
369 |
+# ifndef FIOGETOWN |
370 |
+# define __SYS_SOCKET_H_undef_FIOGETOWN |
371 |
+# endif |
372 |
+# ifndef FIOSETOWN |
373 |
+# define __SYS_SOCKET_H_undef_FIOSETOWN |
374 |
+# endif |
375 |
+# ifndef SIOCATMARK |
376 |
+# define __SYS_SOCKET_H_undef_SIOCATMARK |
377 |
+# endif |
378 |
+# ifndef SIOCGPGRP |
379 |
+# define __SYS_SOCKET_H_undef_SIOCGPGRP |
380 |
+# endif |
381 |
+# ifndef SIOCGSTAMP |
382 |
+# define __SYS_SOCKET_H_undef_SIOCGSTAMP |
383 |
+# endif |
384 |
+# ifndef SIOCGSTAMPNS |
385 |
+# define __SYS_SOCKET_H_undef_SIOCGSTAMPNS |
386 |
+# endif |
387 |
+# ifndef SIOCSPGRP |
388 |
+# define __SYS_SOCKET_H_undef_SIOCSPGRP |
389 |
+# endif |
390 |
+#endif |
391 |
+ |
392 |
+/* Get socket manipulation related informations from kernel headers. */ |
393 |
+#include <asm/socket.h> |
394 |
+ |
395 |
+#if !defined __USE_MISC && !defined __USE_GNU |
396 |
+# ifdef __SYS_SOCKET_H_undef_FIOGETOWN |
397 |
+# undef __SYS_SOCKET_H_undef_FIOGETOWN |
398 |
+# undef FIOGETOWN |
399 |
+# endif |
400 |
+# ifdef __SYS_SOCKET_H_undef_FIOSETOWN |
401 |
+# undef __SYS_SOCKET_H_undef_FIOSETOWN |
402 |
+# undef FIOSETOWN |
403 |
+# endif |
404 |
+# ifdef __SYS_SOCKET_H_undef_SIOCATMARK |
405 |
+# undef __SYS_SOCKET_H_undef_SIOCATMARK |
406 |
+# undef SIOCATMARK |
407 |
+# endif |
408 |
+# ifdef __SYS_SOCKET_H_undef_SIOCGPGRP |
409 |
+# undef __SYS_SOCKET_H_undef_SIOCGPGRP |
410 |
+# undef SIOCGPGRP |
411 |
+# endif |
412 |
+# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMP |
413 |
+# undef __SYS_SOCKET_H_undef_SIOCGSTAMP |
414 |
+# undef SIOCGSTAMP |
415 |
+# endif |
416 |
+# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMPNS |
417 |
+# undef __SYS_SOCKET_H_undef_SIOCGSTAMPNS |
418 |
+# undef SIOCGSTAMPNS |
419 |
+# endif |
420 |
+# ifdef __SYS_SOCKET_H_undef_SIOCSPGRP |
421 |
+# undef __SYS_SOCKET_H_undef_SIOCSPGRP |
422 |
+# undef SIOCSPGRP |
423 |
+# endif |
424 |
+#endif |
425 |
+ |
426 |
+/* Structure used to manipulate the SO_LINGER option. */ |
427 |
+struct linger |
428 |
+ { |
429 |
+ int l_onoff; /* Nonzero to linger on close. */ |
430 |
+ int l_linger; /* Time to linger. */ |
431 |
+ }; |
432 |
+ |
433 |
+#endif /* bits/socket.h */ |
434 |
-- |
435 |
1.6.1.3 |
436 |
|
437 |
|
438 |
|
439 |
|
440 |
1.1 src/patchsets/glibc/2.12.1/ports/6031_all_alpha-glibc-2.12-epoll_create1.patch |
441 |
|
442 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.12.1/ports/6031_all_alpha-glibc-2.12-epoll_create1.patch?rev=1.1&view=markup |
443 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.12.1/ports/6031_all_alpha-glibc-2.12-epoll_create1.patch?rev=1.1&content-type=text/plain |
444 |
|
445 |
Index: 6031_all_alpha-glibc-2.12-epoll_create1.patch |
446 |
=================================================================== |
447 |
https://bugs.gentoo.org/331639 |
448 |
|
449 |
From 3fe89ea4365a2294f56ddba91f3a84086fd15d42 Mon Sep 17 00:00:00 2001 |
450 |
From: Mike Frysinger <vapier@g.o> |
451 |
Date: Tue, 31 Aug 2010 16:06:02 -0400 |
452 |
Subject: [PATCH] linux/alpha: convert from epoll_create2 to epoll_create1 |
453 |
|
454 |
Alpha's epoll.h was missed when epoll_create2 was changed to epoll_create1. |
455 |
|
456 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
457 |
|
458 |
2010-08-31 Mike Frysinger <vapier@g.o> |
459 |
|
460 |
* sysdeps/unix/sysv/linux/alpha/sys/epoll.h (epoll_create2): Delete. |
461 |
(epoll_create1): Add. |
462 |
--- |
463 |
sysdeps/unix/sysv/linux/alpha/sys/epoll.h | 9 +++++---- |
464 |
1 files changed, 5 insertions(+), 4 deletions(-) |
465 |
|
466 |
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/epoll.h b/sysdeps/unix/sysv/linux/alpha/sys/epoll.h |
467 |
index 9f983a5..9177c31 100644 |
468 |
--- ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h |
469 |
+++ ports/sysdeps/unix/sysv/linux/alpha/sys/epoll.h |
470 |
@@ -31,7 +31,7 @@ typedef __sigset_t sigset_t; |
471 |
#endif |
472 |
|
473 |
|
474 |
-/* Flags to be passed to epoll_create2. */ |
475 |
+/* Flags to be passed to epoll_create1. */ |
476 |
enum |
477 |
{ |
478 |
EPOLL_CLOEXEC = 010000000, |
479 |
@@ -101,8 +101,9 @@ __BEGIN_DECLS |
480 |
returned by epoll_create() should be closed with close(). */ |
481 |
extern int epoll_create (int __size) __THROW; |
482 |
|
483 |
-/* Same as epoll_create but with an additional FLAGS parameter. */ |
484 |
-extern int epoll_create2 (int __size, int __flags) __THROW; |
485 |
+/* Same as epoll_create but with an FLAGS parameter. The unused SIZE |
486 |
+ parameter has been dropped. */ |
487 |
+extern int epoll_create1 (int __flags) __THROW; |
488 |
|
489 |
|
490 |
/* Manipulate an epoll instance "epfd". Returns 0 in case of success, |
491 |
-- |
492 |
1.7.2 |