diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-24 21:13:55 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-24 21:13:55 +0000 |
| commit | 977169541668f2287c5f8e239e5743eb9cefcb63 (patch) | |
| tree | babcc4b260b9fda3a335f6eaeac204b1495ce3b8 /sysdeps/unix/sysv/linux/makedev.c | |
| parent | 0f124303c8bebc3258d2d22bdc03271e85b9ea42 (diff) | |
| download | glibc-977169541668f2287c5f8e239e5743eb9cefcb63.tar.gz glibc-977169541668f2287c5f8e239e5743eb9cefcb63.tar.xz glibc-977169541668f2287c5f8e239e5743eb9cefcb63.zip | |
Update.
2003-09-24 Ulrich Drepper <drepper@redhat.com> * sysdeps/ia64/dl-machine.h (RTLD_START): Remove setting of __libc_stack_end. Patch by David Mosberger. 2003-09-24 Jakub Jelinek <jakub@redhat.com> * elf/Versions (ld): Export __libc_stack_end@GLIBC_2.1 instead of __libc_stack_end@GLIBC_PRIVATE. * sysdeps/generic/dl-sysdep.c (DL_STACK_END): Define if not defined. (_dl_sysdep_start): Set __libc_stack_end here. * sysdeps/alpha/dl-machine.h (RTLD_START): Remove setting of __libc_stack_end. * sysdeps/arm/dl-machine.h (RTLD_START): Likewise. * sysdeps/cris/dl-machine.h (RTLD_START): Likewise. * sysdeps/i386/dl-machine.h (RTLD_START): Likewise. * sysdeps/m68k/dl-machine.h (RTLD_START): Likewise. * sysdeps/s390/s390-32/dl-machine.h (RTLD_START): Likewise. * sysdeps/s390/s390-64/dl-machine.h (RTLD_START): Likewise. * sysdeps/sh/dl-machine.h (RTLD_START): Likewise. * sysdeps/x86_64/dl-machine.h (RTLD_START): Likewise. * sysdeps/ia64/dl-machine.h (DL_STACK_END): Define. * sysdeps/sparc/sparc32/dl-machine.h (DL_STACK_END): Define. (RTLD_START): Remove setting of __libc_stack_end. * sysdeps/sparc/sparc64/dl-machine.h (DL_STACK_END): Define. (RTLD_START): Remove setting of __libc_stack_end. 2003-09-24 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/sys/sysmacros.h: Add gnu_dev_ prefix to function definitions. Adjust macro expansions accordingly. * sysdeps/unix/sysv/linux/Versions: Add gnu_dev_ prefix to major, minor, makedev name. * sysdeps/unix/sysv/linux/makedev.c: Likewise. 2003-09-24 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sys/sysmacros.h (major, minor, makedev): Add __THROW.
Diffstat (limited to 'sysdeps/unix/sysv/linux/makedev.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/makedev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/makedev.c b/sysdeps/unix/sysv/linux/makedev.c index 4708e6d419..93b7012da5 100644 --- a/sysdeps/unix/sysv/linux/makedev.c +++ b/sysdeps/unix/sysv/linux/makedev.c @@ -21,19 +21,19 @@ #include <sys/sysmacros.h> unsigned int -major (unsigned long long int dev) +gnu_dev_major (unsigned long long int dev) { return ((dev >> 8) & 0xfff) | ((unsigned int) (dev >> 32) & ~0xfff); } unsigned int -minor (unsigned long long int dev) +gnu_dev_minor (unsigned long long int dev) { return (dev & 0xff) | ((unsigned int) (dev >> 12) & ~0xff); } unsigned long long int -makedev (unsigned int major, unsigned int minor) +gnu_dev_makedev (unsigned int major, unsigned int minor) { return ((minor & 0xff) | ((major & 0xfff) << 8) | (((unsigned long long int) (minor & ~0xff)) << 12) |