summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/bits/socket.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-18 14:46:49 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-18 14:46:49 +0000
commitdfd2464b33ddfcd2706191a340d1737548c5ed19 (patch)
tree9ae7d67d98f13d9c38c54dc97f53ffc5b72c0807 /sysdeps/unix/sysv/linux/bits/socket.h
parent090ca0002ff8ee4ca425bc6088cc097f46c67626 (diff)
Update.
* sysdeps/unix/bsd/poll.c (__poll): Add code to extend sets if any passed file descriptor exceeds the size determined by getdtablesize. * sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Update from inline version in bits/socket.h. * sysdeps/unix/sysv/linux/bits/socket.h: Define __cmsg_nxthdr as inline function only is __USE_EXTERN_INLINES is defined. * time/strftime.c (my_strftime): Make code a bit clearer. Patch by Paul Eggert <eggert@twinsun.com>. by removing SIG_IGN handler for SIGCHLD if necessary.
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits/socket.h')
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 30ba59fc57..74b4ca2ee1 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -194,11 +194,12 @@ struct cmsghdr
+ CMSG_ALIGN (sizeof (struct cmsghdr)))
#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-#ifndef _EXTERN_INLINE
-# define _EXTERN_INLINE extern __inline
-#endif
extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr,
struct cmsghdr *__cmsg));
+#ifdef __USE_EXTERN_INLINES
+# ifndef _EXTERN_INLINE
+# define _EXTERN_INLINE extern __inline
+# endif
_EXTERN_INLINE struct cmsghdr *
__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
{
@@ -216,6 +217,7 @@ __cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
return NULL;
return __cmsg;
}
+#endif /* Use `extern inline'. */
/* Socket level message types. This must match the definitions in
<linux/socket.h>. */