about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/sys
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-29 21:57:16 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-29 21:57:16 +0000
commita7c5324235173ba00a3b4bb5eca947616beb99c9 (patch)
tree495c15f46cdc5d31137b6f8ca165e77bbbfe5c82 /sysdeps/unix/sysv/linux/sys
parentb1c74afa76019a45c7de3a9eab3144bc0d1fce58 (diff)
downloadglibc-a7c5324235173ba00a3b4bb5eca947616beb99c9.tar.gz
glibc-a7c5324235173ba00a3b4bb5eca947616beb99c9.tar.xz
glibc-a7c5324235173ba00a3b4bb5eca947616beb99c9.zip
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys')
-rw-r--r--sysdeps/unix/sysv/linux/sys/sysmacros.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index b3ac83b007..a89944e6ea 100644
--- 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)