r2544 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2007-09-09 18:10:05 +0000 (Sun, 09 Sep 2007)
New Revision: 2544
Added:
glibc-package/trunk/debian/patches/any/local-sysmacros.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* any/local-sysmacros.diff: new patch to declare "major", "minor" and
"makedev" as inline function instead of macros. Closes: #439859.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-09-09 17:46:04 UTC (rev 2543)
+++ glibc-package/trunk/debian/changelog 2007-09-09 18:10:05 UTC (rev 2544)
@@ -18,9 +18,12 @@
* patches/localedata/tailor-iso14651_t1.diff: fix fi_FI locale. Closes:
bug#441026.
* kfreebsd/local-sysdeps.diff: update to revision 1998 (from glibc-bsd).
- * sysdeps/kfreebsd-amd64.mk: uses x86_64 headers also for the i486 flavour now
+ * sysdeps/kfreebsd-amd64.mk: uses x86_64 headers also for the i486 flavour
+ now that they are compatible.
+ * any/local-sysmacros.diff: new patch to declare "major", "minor" and
+ "makedev" as inline function instead of macros. Closes: #439859.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 9 Sep 2007 19:35:56 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 09 Sep 2007 20:08:50 +0200
glibc (2.6.1-2) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/local-sysmacros.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-sysmacros.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-sysmacros.diff 2007-09-09 18:10:05 UTC (rev 2544)
@@ -0,0 +1,30 @@
+--- libc/sysdeps/unix/sysv/linux/sys/sysmacros.h
++++ libc/sysdeps/unix/sysv/linux/sys/sysmacros.h
+@@ -62,9 +62,24 @@
+
+
+ /* 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)
++static inline unsigned int
++__NTH (major (unsigned long long int dev))
++{
++ return gnu_dev_major (dev);
++}
++
++static inline unsigned int
++__NTH (minor (unsigned long long int dev))
++{
++ return gnu_dev_minor (dev);
++}
++
++static inline unsigned long long int
++__NTH (makedev (unsigned int maj, unsigned int min))
++{
++ return gnu_dev_makedev (maj, min);
++}
+ #endif
+
+ #endif /* sys/sysmacros.h */
++
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-09-09 17:46:04 UTC (rev 2543)
+++ glibc-package/trunk/debian/patches/series 2007-09-09 18:10:05 UTC (rev 2544)
@@ -140,6 +140,7 @@
any/local-rtld.diff -p0
any/local-sysctl.diff -p0
any/local-stubs_h.diff
+any/local-sysmacros.diff -p0
any/local-tcsetaddr.diff -p0
any/local-tst-mktime2.diff -p0
any/local-version-sanity.diff -p0
Reply to: