Update copyright notices with scripts/update-copyrights

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / sys / sysmacros.h

diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index 85b1b85d2eb0893d8a2d56370469178fe3f90180..b3c202f34479a00c4163d09a6a28a58c2cb190fc 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -1,29 +1,65 @@
 /* Definitions of macros to access `dev_t' values.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996-2014 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _SYS_SYSMACROS_H
-
 #define _SYS_SYSMACROS_H       1
 
-/* For compatibility we provide alternative names.  */
-#define major(dev) (((dev) >> 8) & 0xff)
-#define minor(dev) ((dev) & 0xff)
-#define makedev(major, minor) (((major) << 8) | (minor))
+#include <features.h>
+
+__BEGIN_DECLS
+
+__extension__
+extern unsigned int gnu_dev_major (unsigned long long int __dev)
+     __THROW __attribute_const__;
+__extension__
+extern unsigned int gnu_dev_minor (unsigned long long int __dev)
+     __THROW __attribute_const__;
+__extension__
+extern unsigned long long int gnu_dev_makedev (unsigned int __major,
+                                              unsigned int __minor)
+     __THROW __attribute_const__;
+
+#ifdef __USE_EXTERN_INLINES
+__extension__ __extern_inline __attribute_const__ unsigned int
+__NTH (gnu_dev_major (unsigned long long int __dev))
+{
+  return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
+}
+
+__extension__ __extern_inline __attribute_const__ unsigned int
+__NTH (gnu_dev_minor (unsigned long long int __dev))
+{
+  return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
+}
+
+__extension__ __extern_inline __attribute_const__ unsigned long long int
+__NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor))
+{
+  return ((__minor & 0xff) | ((__major & 0xfff) << 8)
+         | (((unsigned long long int) (__minor & ~0xff)) << 12)
+         | (((unsigned long long int) (__major & ~0xfff)) << 32));
+}
+#endif
+__END_DECLS
+
+/* Access the functions with their traditional names.  */
+#define major(dev) gnu_dev_major (dev)
+#define minor(dev) gnu_dev_minor (dev)
+#define makedev(maj, min) gnu_dev_makedev (maj, min)
 
-#endif /* _SYS_SYSMACROS_H */
+#endif /* sys/sysmacros.h */