summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.cvsignore2
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/socket.h4
3 files changed, 9 insertions, 3 deletions
diff --git a/.cvsignore b/.cvsignore
index 0a81b82472..213609fcc7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -25,3 +25,5 @@ libc.proj .snprj
 TODO.html
 
 autom4te*.cache
+
+rtkaio
diff --git a/ChangeLog b/ChangeLog
index f0c91e340d..8f3c26ca59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/bsd/bsd4.4/bits/socket.h: Use __NTH for __cmsg_nxthdr.
+
 2004-09-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/nscd.c (pagesize_m1): New variable.
@@ -37,7 +41,7 @@
 	* malloc/malloc.c (_int_free): Only do arena boundary check for
 	contiguous arenas.
 
-2004-09-10  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
+2004-09-10  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
 
 	* stdlib/longlong.h [__M32R__] (add_ssaaaa, sub_ddmmss): Fix broken
 	instruct operands.
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/socket.h b/sysdeps/unix/bsd/bsd4.4/bits/socket.h
index 07a55e3259..b2227f10d2 100644
--- a/sysdeps/unix/bsd/bsd4.4/bits/socket.h
+++ b/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-1999,2000,01,02 Free Software Foundation, Inc.
+   Copyright (C) 1991,92,1994-2002,2004 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
@@ -230,7 +230,7 @@ extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
 #  define _EXTERN_INLINE extern __inline
 # endif
 _EXTERN_INLINE struct cmsghdr *
-__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
+__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
 {
   if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
     /* The kernel header does this so there may be a reason.  */