From: Andreas Jaeger <aj@suse.de>
Date: Fri, 31 Mar 2000 10:21:40 +0000 (+0000)
Subject: 2000-03-31  Andreas Jaeger  <aj@suse.de>
X-Git-Tag: cvs/glibc_2-1-91~741
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93f9ef01e32c551538f11f269ca8c2484214e0ba;p=thirdparty%2Fglibc.git

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.
---

diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c
index cc8a5387e1b..7ea8ee6c397 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 7514f2a6897..f2f7340f7b7 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 *);