diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/msq.h | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/stat.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/timerfd.h | 19 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/timex.h | 32 |
4 files changed, 69 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/msq.h b/sysdeps/unix/sysv/linux/bits/msq.h index 5f43fa36a6..3adaf3b9a7 100644 --- a/sysdeps/unix/sysv/linux/bits/msq.h +++ b/sysdeps/unix/sysv/linux/bits/msq.h @@ -46,6 +46,22 @@ typedef __syscall_ulong_t msglen_t; /* Structure of record for one message inside the kernel. The type `struct msg' is opaque. */ +#ifdef __USE_TIME_BITS64 +struct msqid_ds +{ + struct ipc_perm msg_perm; /* structure describing operation permission */ + __time64_t msg_stime; /* time of last msgsnd command */ + __time64_t msg_rtime; /* time of last msgrcv command */ + __time64_t msg_ctime; /* time of last change */ + unsigned long int __msg_cbytes; /* current number of bytes on queue */ + msgqnum_t msg_qnum; /* number of messages currently on queue */ + msglen_t msg_qbytes; /* max number of bytes allowed on queue */ + __pid_t msg_lspid; /* pid of last msgsnd() */ + __pid_t msg_lrpid; /* pid of last msgrcv() */ + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; +}; +#else struct msqid_ds { struct ipc_perm msg_perm; /* structure describing operation permission */ @@ -60,6 +76,7 @@ struct msqid_ds __syscall_ulong_t __glibc_reserved4; __syscall_ulong_t __glibc_reserved5; }; +#endif #ifdef __USE_MISC diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h index 48ef82d862..fde673ef8d 100644 --- a/sysdeps/unix/sysv/linux/bits/stat.h +++ b/sysdeps/unix/sysv/linux/bits/stat.h @@ -119,11 +119,11 @@ struct stat64 struct timespec st_mtim; /* Time of last modification. */ struct timespec st_ctim; /* Time of last status change. */ # else - __time_t st_atime; /* Time of last access. */ + time_t st_atime; /* Time of last access. */ unsigned long int st_atimensec; /* Nscecs of last access. */ - __time_t st_mtime; /* Time of last modification. */ + time_t st_mtime; /* Time of last modification. */ unsigned long int st_mtimensec; /* Nsecs of last modification. */ - __time_t st_ctime; /* Time of last status change. */ + time_t st_ctime; /* Time of last status change. */ unsigned long int st_ctimensec; /* Nsecs of last status change. */ # endif __ino64_t st_ino; /* File serial number. */ diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h index 37490cf4b1..58d632e9d7 100644 --- a/sysdeps/unix/sysv/linux/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sys/timerfd.h @@ -44,11 +44,30 @@ extern int timerfd_create (__clockid_t __clock_id, int __flags) __THROW; /* Set next expiration time of interval timer source UFD to UTMR. If FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is absolute. Optionally return the old expiration time in OTMR. */ +#ifdef __USE_TIME_BITS64 +# if defined(__REDIRECT) +extern int __REDIRECT (timerfd_settime, (int __ufd, int __flags, + const struct itimerspec *__utmr, + struct itimerspec *__otmr),__timerfd_settime64) + __THROW; +# else +# define timerfd_settime __timerfd_settime64 +# endif +#endif extern int timerfd_settime (int __ufd, int __flags, const struct itimerspec *__utmr, struct itimerspec *__otmr) __THROW; /* Return the next expiration time of UFD. */ +#ifdef __USE_TIME_BITS64 +# if defined(__REDIRECT) +extern int __REDIRECT (timerfd_gettime, (int __ufd, + struct itimerspec *__otmr),__timerfd_gettime64) + __THROW; +# else +# define timerfd_gettime __timerfd_gettime64 +# endif +#endif extern int timerfd_gettime (int __ufd, struct itimerspec *__otmr) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h index fd459297ab..d4ddb33e6d 100644 --- a/sysdeps/unix/sysv/linux/sys/timex.h +++ b/sysdeps/unix/sysv/linux/sys/timex.h @@ -68,15 +68,43 @@ struct __ntptimeval64 __BEGIN_DECLS extern int __adjtimex (struct timex *__ntx) __THROW; + +#ifdef __USE_TIME_BITS64 +# if defined(__REDIRECT) +extern time_t __REDIRECT (adjtimex, (struct timex *__ntx), + __adjtimex64) __THROW; +# else +# define adjtimex __adjtimex64 +# endif +#endif extern int adjtimex (struct timex *__ntx) __THROW; -#ifdef __REDIRECT_NTH +#if __WORDSIZE > 32 || ! defined(__USE_TIME_BITS64) +# ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), ntp_gettimex); -#else +# else extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW; +# define ntp_gettime ntp_gettimex +# endif +#else +# if defined(__REDIRECT) +extern time_t __REDIRECT (ntp_gettimex, (struct ntptimeval *__ntv), + __ntp_gettimex64) __THROW; +# else +# define ntp_gettimex __ntp_gettimex64 +# endif # define ntp_gettime ntp_gettimex #endif + +#ifdef __USE_TIME_BITS64 +# if defined(__REDIRECT) +extern int __REDIRECT (ntp_adjtime, (struct timex *__tntx), + __ntp_adjtime64) __THROW; +# else +# define ntp_adjtime __ntp_adjtime64 +# endif +#endif extern int ntp_adjtime (struct timex *__tntx) __THROW; __END_DECLS |