diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-18 18:01:40 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-18 18:01:40 +0000 |
| commit | 57fa34b52e7c26f780c6bcae7a8ea863dfe710e1 (patch) | |
| tree | 1fe2959ca795d67fb10559d0f300b06c2fd0b68c /libc/sysdeps/unix/bsd | |
| parent | e97d73d87846a62aff09c388bd938c0b1d410931 (diff) | |
| download | eglibc2-57fa34b52e7c26f780c6bcae7a8ea863dfe710e1.tar.gz | |
Merge changes between r1382 and r1748 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@1749 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/bsd')
| -rw-r--r-- | libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h b/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h index b2227f10d..f74603f94 100644 --- a/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h +++ b/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. 4.4 BSD version. - Copyright (C) 1991,92,1994-2002,2004 Free Software Foundation, Inc. + Copyright (C) 1991,92,1994-2002,2004,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -227,7 +227,7 @@ extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW; #ifdef __USE_EXTERN_INLINES # ifndef _EXTERN_INLINE -# define _EXTERN_INLINE extern __inline +# define _EXTERN_INLINE __extern_inline # endif _EXTERN_INLINE struct cmsghdr * __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) |