diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-01-06 22:07:28 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-06 22:07:28 +0000 |
| commit | df4ef2ab9c0899b2670067cd97e58f7eb2913e00 (patch) | |
| tree | 4cb343b5ba9ccdc9c0b96144412567b6a4eda0ee /sysdeps/unix/sysv/linux/sys/sysmacros.h | |
| parent | 6f9e7002f38ae778b3ff2f586a3e5766382228e9 (diff) | |
update from main archive 960105cvs/libc-970107cvs/libc-970106
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys/sysmacros.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysmacros.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h index caf4566414..b859dc7d64 100644 --- a/sysdeps/unix/sysv/linux/sys/sysmacros.h +++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h @@ -1,5 +1,5 @@ /* Definitions of macros to access `dev_t' values. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 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 @@ -21,12 +21,9 @@ #define _SYS_SYSMACROS_H 1 -/* Get definition from kernel header. */ -#include <linux/kdev_t.h> - /* For compatibility we provide alternative names. */ -#define major(dev) MAJOR ((unsigned int) (dev)) -#define minor(dev) MINOR ((unsigned int) (dev)) -#define makedev(major, minor) MKDEV (major, minor) +#define major(dev) ((dev) >> 32) +#define minor(dev) ((dev) & 0xffffffff) +#define makedev(major, minor) (((major) << 32) | (monor)) #endif /* _SYS_SYSMACROS_H */ |