Skip to content

Commit

Permalink
Update sysdeps/unix/sysv/linux/sparc/bits/socket.h
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Schwab authored and Ulrich Drepper committed Feb 8, 2011
1 parent 2b7e92d commit edf9294
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 9 deletions.
17 changes: 10 additions & 7 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
2011-02-03 Andreas Schwab <schwab@redhat.com>

* sysdeps/unix/sysv/linux/sparc/bits/socket.h: Sync with
sysdeps/unix/sysv/linux/bits/socket.h.

2011-01-30 Samuel Thibault <samuel.thibault@ens-lyon.org>

This brings the variable-size cpu_set_t manipulation macros from
./sysdeps/unix/sysv/linux/bits/sched.h
* bits/sched.h (__CPU_ZERO, __CPU_SET, __CPU_CLR, __CPU_ISSET,
__CPU_COUNT): Remove old macros.
(__CPU_ZERO_S, __CPU_SET_S, __CPU_CLR_S, __CPU_ISSET_S,
__CPU_COUNT, __CPU_EQUAL_S, __CPU_OP_S, __CPU_ALLOC_SIZE,
__CPU_ALLOC, __CPU_FREE): Add macros.
* bits/sched.h (__CPU_ZERO, __CPU_SET, __CPU_CLR, __CPU_ISSET)
(__CPU_COUNT): Remove old macros.
(__CPU_ZERO_S, __CPU_SET_S, __CPU_CLR_S, __CPU_ISSET_S)
(__CPU_COUNT, __CPU_EQUAL_S, __CPU_OP_S, __CPU_ALLOC_SIZE)
(__CPU_ALLOC, __CPU_FREE): Add macros.
(__sched_cpualloc, __sched_cpufree): Add declarations.

2011-02-05 Ulrich Drepper <drepper@gmail.com>
Expand Down
30 changes: 28 additions & 2 deletions sysdeps/unix/sysv/linux/sparc/bits/socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ enum __socket_type
other similar things on the user level. */
#define SOCK_PACKET SOCK_PACKET

/* Flags to be ORed into the type parameter of socket and socketpair. */
/* Flags to be ORed into the type parameter of socket and socketpair and
used for the flags parameter of paccept. */

SOCK_CLOEXEC = 0x400000, /* Atomically set close-on-exec flag for the
new descriptor(s). */
Expand Down Expand Up @@ -235,6 +236,8 @@ enum
#define MSG_NOSIGNAL MSG_NOSIGNAL
MSG_MORE = 0x8000, /* Sender will send more. */
#define MSG_MORE MSG_MORE
MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
#define MSG_WAITFORONE MSG_WAITFORONE

MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
descriptor received through
Expand Down Expand Up @@ -262,6 +265,15 @@ struct msghdr
int msg_flags; /* Flags on received message. */
};

#ifdef __USE_GNU
/* For `recvmmsg'. */
struct mmsghdr
{
struct msghdr msg_hdr; /* Actual message header. */
unsigned int msg_len; /* Number of received bytes for the entry. */
};
#endif

/* Structure used for storage of ancillary data object information. */
struct cmsghdr
{
Expand Down Expand Up @@ -324,7 +336,7 @@ enum
{
SCM_RIGHTS = 0x01 /* Transfer file descriptors. */
#define SCM_RIGHTS SCM_RIGHTS
#ifdef __USE_BSD
#ifdef __USE_GNU
, SCM_CREDENTIALS = 0x02 /* Credentials passing. */
# define SCM_CREDENTIALS SCM_CREDENTIALS
#endif
Expand Down Expand Up @@ -406,4 +418,18 @@ struct linger
int l_linger; /* Time to linger. */
};


__BEGIN_DECLS

/* Receive a message as described by MESSAGE from socket FD.
Returns the number of bytes read or -1 for errors.
This function is a cancellation point and therefore not marked with
__THROW. */
extern int recvmmsg (int __fd, struct mmsghdr *__vmessages,
unsigned int __vlen, int __flags,
__const struct timespec *__tmo);

__END_DECLS

#endif /* bits/socket.h */

0 comments on commit edf9294

Please sign in to comment.