diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-09-07 14:29:53 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-09-07 14:29:53 +0200 |
| commit | 59178ef977d3c8392eff263d40a16d7c741edca4 (patch) | |
| tree | ad2ec57e690cd264a1ea3700a13dd7aaf79cfcbf | |
| parent | 9e5c9dcd57e80cd56c47fd2bf11de8d167176a0e (diff) | |
| download | glibc-59178ef977d3c8392eff263d40a16d7c741edca4.tar.gz glibc-59178ef977d3c8392eff263d40a16d7c741edca4.tar.xz glibc-59178ef977d3c8392eff263d40a16d7c741edca4.zip | |
Revert "Fix semid_ds for x86-64"
This reverts commit 2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/sem.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3011a5abc3..e0678f2867 100644 --- 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 7153e21431..e86c3578ba 100644 --- 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; |