From a7c5324235173ba00a3b4bb5eca947616beb99c9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 29 Sep 2003 21:57:16 +0000 Subject: Update. 2003-09-28 Alfred M. Szmidt * sysdeps/mach/hurd/bits/libc-lock.h (__libc_cleanup_pop): Redefine and use __libc_cleanup_region_end instead. 2003-09-29 Thorsten Kukuk * sysdeps/unix/sysv/linux/sys/sysmacros.h: Use __inline and fix prototypes for picky C++ compilers. --- sysdeps/unix/sysv/linux/sys/sysmacros.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sys') 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) -- cgit 1.4.1