From 501c7ba9be8bdfb66e943858fb973fd959159e09 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 5 Oct 2009 00:24:36 -0700 Subject: [PATCH] --- yaml --- r: 166971 b: refs/heads/master c: 9c501935a3cdcf6b1d35aaee3aa11c7a7051a305 h: refs/heads/master i: 166969: f23069fc153946e204fffc7fe99a2c0404c3beeb 166967: 56183edcfff5ab705669b46ea4274ad342372eb7 v: v3 --- [refs] | 2 +- trunk/include/linux/socket.h | 21 +++------------------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 2cfaae1bcd58..a730f52b381c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9240d7154e766ce6f3b615e81ed28f7562f509a5 +refs/heads/master: 9c501935a3cdcf6b1d35aaee3aa11c7a7051a305 diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h index 3b461dffe244..3273a0c5043b 100644 --- a/trunk/include/linux/socket.h +++ b/trunk/include/linux/socket.h @@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage { /* _SS_MAXSIZE value minus size of ss_family */ } __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) +#ifdef __KERNEL__ #include /* arch-dependent defines */ #include /* the SIOCxxx I/O controls */ @@ -100,21 +100,6 @@ struct cmsghdr { ((mhdr)->msg_controllen - \ ((char *)(cmsg) - (char *)(mhdr)->msg_control))) -/* - * This mess will go away with glibc - */ - -#ifdef __KERNEL__ -#define __KINLINE static inline -#elif defined(__GNUC__) -#define __KINLINE static __inline__ -#elif defined(__cplusplus) -#define __KINLINE static inline -#else -#define __KINLINE static -#endif - - /* * Get the next cmsg header * @@ -128,7 +113,7 @@ struct cmsghdr { * ancillary object DATA. --ANK (980731) */ -__KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size, +static inline struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size, struct cmsghdr *__cmsg) { struct cmsghdr * __ptr; @@ -140,7 +125,7 @@ __KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size, return __ptr; } -__KINLINE struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr *__cmsg) +static inline struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr *__cmsg) { return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg); }