From f21aa4c28f70da7efccf44f4be0d5239ac0aa711 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 7 Jun 1999 00:08:27 +0000 Subject: [PATCH] Update. 1999-06-07 Ulrich Drepper * sysdeps/unix/sysv/linux/sys/sysmacros.h (makedev): Handle signed parameters. --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/sys/sysmacros.h | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7fa0d4..30829e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-06-07 Ulrich Drepper + + * sysdeps/unix/sysv/linux/sys/sysmacros.h (makedev): Handle signed + parameters. + 1999-06-06 Ulrich Drepper * sysdeps/unix/sysv/linux/kernel-features.h: Define diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h index 4c06539..63c1343 100644 --- a/sysdeps/unix/sysv/linux/sys/sysmacros.h +++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h @@ -27,11 +27,13 @@ #if defined __GNUC__ && __GNUC__ >= 2 # define major(dev) ((int)(((dev) >> 8) & 0xff)) # define minor(dev) ((int)((dev) & 0xff)) -# define makedev(major, minor) (((major) << 8) | (minor)) +# define makedev(major, minor) ((((unsigned int) (major)) << 8) \ + | ((unsigned int) (minor))) #else # define major(dev) (((dev).__val[0] >> 8) & 0xff) # define minor(dev) ((dev).__val[0] & 0xff) -# define makedev(major, minor) { (((major) << 8) | (minor)), 0 } +# define makedev(major, minor) { ((((unsigned int) (major)) << 8) \ + | ((unsigned int) (minor))), 0 } #endif #endif /* sys/sysmacros.h */ -- 2.7.4