aboutsummaryrefslogtreecommitdiff
path: root/arch/generic
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2019-07-29 18:03:41 -0400
committerRich Felker <dalias@aerifal.cx>2019-07-29 18:03:41 -0400
commit1afe5f3e5b504992914362d6c1c0a0af55f3b32b (patch)
tree9338410d72d7fa265122b05dc82a116b3f1b1696 /arch/generic
parent7f797b5e255fa91296ac02e767ca16edea19c828 (diff)
downloadmusl-1afe5f3e5b504992914362d6c1c0a0af55f3b32b.tar.gz
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/generic')
-rw-r--r--arch/generic/bits/sem.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/generic/bits/sem.h b/arch/generic/bits/sem.h
index c629b81e..d383d4ea 100644
--- a/arch/generic/bits/sem.h
+++ b/arch/generic/bits/sem.h
@@ -1,16 +1,16 @@
struct semid_ds {
struct ipc_perm sem_perm;
time_t sem_otime;
- time_t __unused1;
+ long __unused1;
time_t sem_ctime;
- time_t __unused2;
+ long __unused2;
#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;
};