* sysdeps/unix/sysv/linux/bits/socket.h: Define PF_ISDN and AF_ISDN.

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

diff --git a/ChangeLog b/ChangeLog
index df99b841382daf05a44f99b9bf670bc0c1e83635..b37f4c5f6d45acfd51075bf2bac64acbc6065be5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_ISDN and AF_ISDN.
+       * sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise.
+
 2008-07-26  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #6771]

diff --git a/libio/fileops.c b/libio/fileops.c
index f5b256998d19a0ec65e5b820b5c7c86ce4818590..cf47c915a7e77ee795d3a0228bbee97e5f4a7d5b 100644 (file)
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -432,7 +432,7 @@ _IO_new_file_attach (fp, fd)
   if (_IO_SEEKOFF (fp, (_IO_off64_t)0, _IO_seek_cur, _IOS_INPUT|_IOS_OUTPUT)
       == _IO_pos_BAD && errno != ESPIPE)
     return NULL;
-  errno = save_errno;
+  __set_errno (save_errno);
   return fp;
 }
 INTDEF2(_IO_new_file_attach, _IO_file_attach)

diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 187d964bdf32145a15d81a9addc2b39811b5a173..87c3b918025e2f94407a99f45bbab2f8d8b51d4a 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -102,7 +102,8 @@ enum __socket_type
 #define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_IUCV         32      /* IUCV sockets.  */
 #define PF_RXRPC       33      /* RxRPC sockets.  */
-#define        PF_MAX          34      /* For now..  */
+#define PF_ISDN                34      /* mISDN sockets.  */
+#define        PF_MAX          35      /* For now..  */
 
 /* Address families.  */
 #define        AF_UNSPEC       PF_UNSPEC
@@ -136,6 +137,7 @@ enum __socket_type
 #define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_IUCV         PF_IUCV
 #define AF_RXRPC       PF_RXRPC
+#define AF_ISDN                PF_ISDN
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
index 032b7df488257d5bbb192cfc3627c0e785a585bb..d43a3cdf794b527d81854629728932b92d6a204e 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
@@ -101,7 +101,8 @@ enum __socket_type
 #define        PF_BLUETOOTH    31      /* Bluetooth sockets.  */
 #define        PF_IUCV         32      /* IUCV sockets.  */
 #define PF_RXRPC       33      /* RxRPC sockets.  */
-#define        PF_MAX          34      /* For now..  */
+#define PF_ISDN                34      /* mISDN sockets.  */
+#define        PF_MAX          35      /* For now..  */
 
 /* Address families.  */
 #define        AF_UNSPEC       PF_UNSPEC
@@ -135,6 +136,7 @@ enum __socket_type
 #define        AF_BLUETOOTH    PF_BLUETOOTH
 #define        AF_IUCV         PF_IUCV
 #define AF_RXRPC       PF_RXRPC
+#define AF_ISDN                PF_ISDN
 #define        AF_MAX          PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.