mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-18 08:51:06 +00:00
(__fd_set): Define element as fds_bits only is __USE_XOPEN. Otherwise
use __fds_bits.
This commit is contained in:
parent
0b78da0365
commit
b227d2e7eb
@ -102,8 +102,13 @@ typedef unsigned long int __fd_mask;
|
|||||||
/* fd_set for select and pselect. */
|
/* fd_set for select and pselect. */
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
/* XPG4.2 requires this member name. */
|
/* XPG4.2 requires this member name. Otherwise avoid the name
|
||||||
|
from the user namespace. */
|
||||||
|
#ifdef __USE_XOPEN
|
||||||
__fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
|
__fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
|
||||||
|
#else
|
||||||
|
__fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS];
|
||||||
|
#endif
|
||||||
} __fd_set;
|
} __fd_set;
|
||||||
|
|
||||||
/* Used in XTI. */
|
/* Used in XTI. */
|
||||||
@ -115,6 +120,8 @@ typedef long int __intptr_t;
|
|||||||
|
|
||||||
|
|
||||||
/* Now add the thread types. */
|
/* Now add the thread types. */
|
||||||
#include <bits/pthreadtypes.h>
|
#if defined __USE_POSIX199506 || defined __USE_UNIX98
|
||||||
|
# include <bits/pthreadtypes.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* bits/types.h */
|
#endif /* bits/types.h */
|
||||||
|
@ -99,8 +99,13 @@ typedef unsigned long int __fd_mask;
|
|||||||
/* fd_set for select and pselect. */
|
/* fd_set for select and pselect. */
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
/* XPG4.2 requires this member name. */
|
/* XPG4.2 requires this member name. Otherwise avoid the name
|
||||||
|
from the user namespace. */
|
||||||
|
#ifdef __USE_XOPEN
|
||||||
__fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
|
__fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
|
||||||
|
#else
|
||||||
|
__fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS];
|
||||||
|
#endif
|
||||||
} __fd_set;
|
} __fd_set;
|
||||||
|
|
||||||
|
|
||||||
@ -139,6 +144,8 @@ typedef int __intptr_t;
|
|||||||
|
|
||||||
|
|
||||||
/* Now add the thread types. */
|
/* Now add the thread types. */
|
||||||
#include <bits/pthreadtypes.h>
|
#if defined __USE_POSIX199506 || defined __USE_UNIX98
|
||||||
|
# include <bits/pthreadtypes.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* bits/types.h */
|
#endif /* bits/types.h */
|
||||||
|
@ -90,8 +90,13 @@ typedef int __key_t; /* Type of an IPC key */
|
|||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
/* XPG4.2 requires this member name. */
|
/* XPG4.2 requires this member name. Otherwise avoid the name
|
||||||
|
from the user namespace. */
|
||||||
|
#ifdef __USE_XOPEN
|
||||||
unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
|
unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
|
||||||
|
#else
|
||||||
|
unsigned long int __fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS];
|
||||||
|
#endif
|
||||||
} __fd_set;
|
} __fd_set;
|
||||||
|
|
||||||
typedef unsigned long int __fd_mask;
|
typedef unsigned long int __fd_mask;
|
||||||
|
Loading…
Reference in New Issue
Block a user