summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-03-31 10:21:40 +0000
committerAndreas Jaeger <aj@suse.de>2000-03-31 10:21:40 +0000
commit93f9ef01e32c551538f11f269ca8c2484214e0ba (patch)
tree5a4661ade71f72bbec3af974a0b6e41edfd253ff /sysdeps
parent9ad04ff7e0522935bbaa0d83bac81fc0b947e95e (diff)
downloadglibc-93f9ef01e32c551538f11f269ca8c2484214e0ba.tar.gz
2000-03-31 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/semctl.c (struct __old_semid_ds): Remove SHLIB_COMPAT - the struct is always needed.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/semctl.c2
-rw-r--r--sysdeps/unix/sysv/linux/shmctl.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c
index cc8a5387e1..7ea8ee6c39 100644
--- a/sysdeps/unix/sysv/linux/semctl.c
+++ b/sysdeps/unix/sysv/linux/semctl.c
@@ -29,7 +29,6 @@
#include "kernel-features.h"
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
struct __old_semid_ds
{
struct __old_ipc_perm sem_perm; /* operation permission struct */
@@ -41,7 +40,6 @@ struct __old_semid_ds
struct sem_undo *__undo; /* ondo requests on this array */
unsigned short int sem_nsems; /* number of semaphores in set */
};
-#endif
/* Define a `union semun' suitable for Linux here. */
union semun
diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c
index 7514f2a689..f2f7340f7b 100644
--- a/sysdeps/unix/sysv/linux/shmctl.c
+++ b/sysdeps/unix/sysv/linux/shmctl.c
@@ -29,7 +29,6 @@
#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 */
@@ -55,6 +54,7 @@ struct __old_shminfo
};
/* Provide operations to control over shared memory segments. */
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
int __old_shmctl (int, int, struct __old_shmid_ds *);
#endif
int __new_shmctl (int, int, struct shmid_ds *);