Update.

2003-09-28  Alfred M. Szmidt  <ams@kemisten.nu>

	* sysdeps/mach/hurd/bits/libc-lock.h (__libc_cleanup_pop):
	Redefine and use __libc_cleanup_region_end instead.

2003-09-29  Thorsten Kukuk  <kukuk@suse.de>

	* sysdeps/unix/sysv/linux/sys/sysmacros.h: Use __inline and
	fix prototypes for picky C++ compilers.

diff --git a/ChangeLog b/ChangeLog
index 0414cfc..197b982 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-28  Alfred M. Szmidt  <ams@kemisten.nu>
+
+       * sysdeps/mach/hurd/bits/libc-lock.h (__libc_cleanup_pop):
+       Redefine and use __libc_cleanup_region_end instead.
+
+2003-09-29  Thorsten Kukuk  <kukuk@suse.de>
+
+       * sysdeps/unix/sysv/linux/sys/sysmacros.h: Use __inline and
+       fix prototypes for picky C++ compilers.
+
 2003-09-27  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/ustat.c (ustat): Set errno to EINVAL if

diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h
index 5e3388e..0fa90bc 100644 (file)
--- a/sysdeps/mach/hurd/bits/libc-lock.h
+++ b/sysdeps/mach/hurd/bits/libc-lock.h
@@ -1,5 +1,5 @@
 /* libc-internal interface for mutex locks.  Hurd version using Mach cthreads.
-   Copyright (C) 1996,97,98,2000,01, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,98,2000,01, 2002, 2003 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
@@ -160,7 +160,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
     (*__save_FCT)(__save_ARG);                                             \
 
 #define __libc_cleanup_push(fct, arg) __libc_cleanup_region_start (1, fct, arg)
-#define __libc_cleanup_pop(execute) __libc_cleanup_end (execute)
+#define __libc_cleanup_pop(execute) __libc_cleanup_region_end (execute)
 
 #if (_CTHREADS_ - 0)
 

diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index b3ac83b..a89944e 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -26,28 +26,28 @@
    not going to hack weird hacks to support the dev_t representation
    they need.  */
 #ifdef __GLIBC_HAVE_LONG_LONG
-extern unsigned int inline gnu_dev_major (unsigned long long int __dev)
+extern __inline unsigned int gnu_dev_major (unsigned long long int __dev)
      __THROW;
-extern unsigned int inline gnu_dev_minor (unsigned long long int __dev)
+extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev)
      __THROW;
-extern unsigned long long int inline gnu_dev_makedev (unsigned int __major,
+extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major,
                                                      unsigned int __minor)
      __THROW;
 
 # if defined __GNUC__ && __GNUC__ >= 2
-extern inline unsigned int
+extern __inline unsigned int
 gnu_dev_major (unsigned long long int __dev) __THROW
 {
   return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
 }
 
-extern inline unsigned int
+extern __inline unsigned int
 gnu_dev_minor (unsigned long long int __dev) __THROW
 {
   return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
 }
 
-extern inline unsigned long long int
+extern __inline unsigned long long int
 gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW
 {
   return ((__minor & 0xff) | ((__major & 0xfff) << 8)