diff options
author | Rich Felker <dalias@aerifal.cx> | 2019-07-29 18:03:41 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2019-07-29 18:03:41 -0400 |
commit | 1afe5f3e5b504992914362d6c1c0a0af55f3b32b (patch) | |
tree | 9338410d72d7fa265122b05dc82a116b3f1b1696 /arch/mips/bits/sem.h | |
parent | 7f797b5e255fa91296ac02e767ca16edea19c828 (diff) | |
download | musl-1afe5f3e5b504992914362d6c1c0a0af55f3b32b.tar.gz musl-1afe5f3e5b504992914362d6c1c0a0af55f3b32b.tar.bz2 musl-1afe5f3e5b504992914362d6c1c0a0af55f3b32b.tar.xz musl-1afe5f3e5b504992914362d6c1c0a0af55f3b32b.zip |
extricate bits/sem.h from x32 time_t hack
various padding fields in the generic bits/sem.h were defined in terms
of time_t as a cheap hack standing in for "kernel long", to allow x32
to use the generic version of the file. this was a really bad idea, as
it ended up getting copied into lots of arch-specific versions of the
bits file, and is a blocker to changing time_t to 64-bit on 32-bit
archs.
this commit adds an x32-specific version of the header, and changes
padding type back from time_t to long (currently the same type on all
archs but x32) in the generic header and all the others the hack got
copied into.
Diffstat (limited to 'arch/mips/bits/sem.h')
-rw-r--r-- | arch/mips/bits/sem.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/bits/sem.h b/arch/mips/bits/sem.h index e46ced95..5184eb59 100644 --- a/arch/mips/bits/sem.h +++ b/arch/mips/bits/sem.h @@ -4,11 +4,11 @@ struct semid_ds { time_t sem_ctime; #if __BYTE_ORDER == __LITTLE_ENDIAN unsigned short sem_nsems; - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; + char __sem_nsems_pad[sizeof(long)-sizeof(short)]; #else - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; + char __sem_nsems_pad[sizeof(long)-sizeof(short)]; unsigned short sem_nsems; #endif - time_t __unused3; - time_t __unused4; + long __unused3; + long __unused4; }; |