Fix shlib-compat patch
Andreas Jaeger
aj@suse.de
Fri Mar 31 02:22:00 GMT 2000
My last patch contained a few problems, I've committed the appended
patch to CVS.
Andreas
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.
============================================================
Index: sysdeps/unix/sysv/linux/shmctl.c
--- sysdeps/unix/sysv/linux/shmctl.c 2000/03/31 05:14:28 1.6
+++ sysdeps/unix/sysv/linux/shmctl.c 2000/03/31 10:20:18
@@ -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 @@
};
/* 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 *);
============================================================
Index: sysdeps/unix/sysv/linux/semctl.c
--- sysdeps/unix/sysv/linux/semctl.c 2000/03/31 05:14:28 1.8
+++ sysdeps/unix/sysv/linux/semctl.c 2000/03/31 10:20:18
@@ -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 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
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.rhein-neckar.de
More information about the Libc-hacker
mailing list