diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-06-16 14:31:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-06-16 14:31:04 +0000 |
| commit | 14a1bb6a085f0b05427c47452f762a70b8530f23 (patch) | |
| tree | 12a12075cc0e83bcd85c0e13371c4223d0761aca /sysdeps/unix/sysv/linux/sys | |
| parent | a964e1f1efb87088ec2acfe52d9119e5244356d2 (diff) | |
| download | glibc-14a1bb6a085f0b05427c47452f762a70b8530f23.zip glibc-14a1bb6a085f0b05427c47452f762a70b8530f23.tar.gz glibc-14a1bb6a085f0b05427c47452f762a70b8530f23.tar.bz2 | |
Update.
1999-06-14 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/unix/sysv/linux/sys/sysmacros.h [!__GNUC__]: Use correct
word order.
* sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h: New file.
* sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h: New file.
1999-06-15 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* db2/db/db.c: Restore __nss_db_open alias.
* db2/db_int.h: Use <db.h> instead of "db.h" to find header in
include.
* db2/os/os_rw.c (__os_write): Maintain const correctness.
* db2/progs/db_load/db_load.c (main): Avoid ambiguous `else'.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysmacros.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h index 63c1343..35760e5 100644 --- a/sysdeps/unix/sysv/linux/sys/sysmacros.h +++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h @@ -30,10 +30,20 @@ # 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) { ((((unsigned int) (major)) << 8) \ - | ((unsigned int) (minor))), 0 } +/* We need to know the word order here. This assumes that the word order + is consistent with the byte order. */ +# include <endian.h> +# if __BYTE_ORDER == __BIG_ENDIAN +# define major(dev) (((dev).__val[1] >> 8) & 0xff) +# define minor(dev) ((dev).__val[1] & 0xff) +# define makedev(major, minor) { 0, ((((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) { ((((unsigned int) (major)) << 8) \ + | ((unsigned int) (minor))), 0 } +# endif #endif #endif /* sys/sysmacros.h */ |