Finalize the merge from the trunk. There are more files to be

merged, but they will be done manually.

1 files changed, 10 insertions, 9 deletions

diff --git a/libc/sysdeps/linux/common/bits/sem.h b/libc/sysdeps/linux/common/bits/sem.h
index f900136f0..6193501e2 100644
--- a/libc/sysdeps/linux/common/bits/sem.h
+++ b/libc/sysdeps/linux/common/bits/sem.h
@@ -36,15 +36,16 @@
 
 
 /* Data structure describing a set of semaphores.  */
-struct semid_ds {
-    struct ipc_perm	sem_perm;		/* permissions .. see ipc.h */
-    __kernel_time_t	sem_otime;		/* last semop time */
-    __kernel_time_t	sem_ctime;		/* last change time */
-    struct sem		*sem_base;		/* ptr to first semaphore in array */
-    struct sem_queue	*sem_pending;		/* pending operations to be processed */
-    struct sem_queue	**sem_pending_last;	/* last pending operation */
-    struct sem_undo	*undo;			/* undo requests on this array */
-    unsigned short	sem_nsems;		/* no. of semaphores in array */
+struct semid_ds
+{
+  struct ipc_perm sem_perm;		/* operation permission struct */
+  __time_t sem_otime;			/* last semop() time */
+  unsigned long int __unused1;
+  __time_t sem_ctime;			/* last time changed by semctl() */
+  unsigned long int __unused2;
+  unsigned long int sem_nsems;		/* number of semaphores in set */
+  unsigned long int __unused3;
+  unsigned long int __unused4;
 };
 
 /* The user should define a union like the following to use it for arguments