Revert "Fix semid_ds for x86-64"

This reverts commit 2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba.

diff --git a/ChangeLog b/ChangeLog
index 3011a5a..e0678f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-07  Andreas Schwab  <schwab@redhat.com>
+
+       [BZ #13144]
+       * sysdeps/unix/sysv/linux/x86_64/bits/sem.h (semdid_ds): Revert
+       last change.
+
 2011-09-07  Ulrich Drepper  <drepper@gmail.com>
 
        * sysdeps/unix/sysv/linux/x86_64/init-first.c

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
index 7153e21..e86c357 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
@@ -40,13 +40,9 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;            /* operation permission struct */
   __time_t sem_otime;                  /* last semop() time */
-#if __WORDSIZE == 32
   unsigned long int __unused1;
-#endif
   __time_t sem_ctime;                  /* last time changed by semctl() */
-#if __WORDSIZE == 32
   unsigned long int __unused2;
-#endif
   unsigned long int sem_nsems;         /* number of semaphores in set */
   unsigned long int __unused3;
   unsigned long int __unused4;