diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-03-31 05:50:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-03-31 05:50:02 +0000 |
| commit | b5567b2af66e2be232c0db9bf189424c039465d2 (patch) | |
| tree | 9273a3119bdb9e10fca7376a2b933bc41eded931 /sysdeps/unix/sysv/linux/shmctl.c | |
| parent | b86120ed685c140c3d19386d463d6efba436ab92 (diff) | |
| download | glibc-b5567b2af66e2be232c0db9bf189424c039465d2.tar glibc-b5567b2af66e2be232c0db9bf189424c039465d2.tar.gz glibc-b5567b2af66e2be232c0db9bf189424c039465d2.tar.bz2 glibc-b5567b2af66e2be232c0db9bf189424c039465d2.zip | |
Update.
2000-03-29 Jes Sorensen <jes@pcatls01.cern.ch>
* malloc/malloc.c: Declare bit flags UL so that they will not
default to int size when being inverted.
2000-03-29 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/arm/errlist.c: Use shlib-compat macros.
* sysdeps/unix/sysv/linux/arm/siglist.c: Likewise.
2000-03-29 Andreas Jaeger <aj@suse.de>,
Ralf Baechle <ralf@uni-koblenz.de>
* Makeconfig: Introduce new variable SHARED to mark code used in
the shared library.
* elf/dl-close.c: Use it instead of PIC.
* elf/dl-load.c: Likewise.
* elf/dl-open.c: Likewise.
* hurd/geteuids.c: Likewise.
* include/libc-symbols.h: Likewise.
* include/shlib-compat.h: Likewise.
* libio/freopen.c: Likewise.
* linuxthreads/cancel.c: Likewise.
* linuxthreads/pthread.c: Likewise.
* linuxthreads/wrapsyscall.c: Likewise.
* nss/nsswitch.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
* sysdeps/arm/init-first.c: Likewise.
* sysdeps/i386/init-first.c: Likewise
* sysdeps/generic/init-first.c: Likewise.
* sysdeps/generic/libc-start.c: Likewise.
* sysdeps/mips/init-first.c: Likewise.
* sysdeps/powerpc/elf/libc-start.c: Likewise.
* sysdeps/unix/sysv/linux/init-first.c: Likewise.
* sysdeps/unix/sysv/linux/arm/siglist.c: Likewise.
* sysdeps/unix/sysv/linux/arm/errlist.c: Likewise.
* sysdeps/unix/sysv/linux/i386/chown.c: Likewise.
* sysdeps/mips/machine-gmon.h (asm): Use __PIC__ as check.
Diffstat (limited to 'sysdeps/unix/sysv/linux/shmctl.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/shmctl.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 4e76794eff..7514f2a689 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -25,9 +25,11 @@ #include <string.h> #include <sys/syscall.h> #include <bits/wordsize.h> +#include <shlib-compat.h> #include "kernel-features.h" +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) struct __old_shmid_ds { struct __old_ipc_perm shm_perm; /* operation permission struct */ @@ -54,13 +56,17 @@ struct __old_shminfo /* Provide operations to control over shared memory segments. */ int __old_shmctl (int, int, struct __old_shmid_ds *); +#endif int __new_shmctl (int, int, struct shmid_ds *); +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) int __old_shmctl (int shmid, int cmd, struct __old_shmid_ds *buf) { return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } +compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0); +#endif int __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) @@ -141,9 +147,4 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) #endif } -#if defined PIC && DO_VERSIONING -default_symbol_version (__new_shmctl, shmctl, GLIBC_2.2); -symbol_version (__old_shmctl, shmctl, GLIBC_2.0); -#else -weak_alias (__new_shmctl, shmctl); -#endif +versioned_symbol (libc, __new_shmctl, shmctl, GLIBC_2_2); |