Message ID | 20160830011645.25769-13-zackw@panix.com |
---|---|
State | New |
Headers | show |
On 08/29/2016 09:16 PM, Zack Weinberg wrote: > Three small and relatively obvious changes: avoid some > conditionally-defined names in the user namespace, and remove a > #warning that was the sole actual problem with using sys/ipc.h without > _GNU_SOURCE/_XOPEN_SOURCE. > > * sysdeps/unix/sysv/linux/sys/quota.h: > Use __caddr_t instead of caddr_t. > * sysdeps/unix/sysv/linux/sys/timerfd.h: > Use __clockid_t instead of clockid_t. > > * sysvipc/sys/ipc.h: Remove unnecessary #warning. LGTM.
diff --git a/sysdeps/unix/sysv/linux/sys/quota.h b/sysdeps/unix/sysv/linux/sys/quota.h index 3e6b4ba..dfbc80f 100644 --- a/sysdeps/unix/sysv/linux/sys/quota.h +++ b/sysdeps/unix/sysv/linux/sys/quota.h @@ -219,7 +219,7 @@ struct dqinfo __BEGIN_DECLS extern int quotactl (int __cmd, const char *__special, int __id, - caddr_t __addr) __THROW; + __caddr_t __addr) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h index ea75aaa..492c488 100644 --- a/sysdeps/unix/sysv/linux/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sys/timerfd.h @@ -36,7 +36,7 @@ enum __BEGIN_DECLS /* Return file descriptor for new interval timer source. */ -extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; +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 diff --git a/sysvipc/sys/ipc.h b/sysvipc/sys/ipc.h index 70bd7a6..0392662 100644 --- a/sysvipc/sys/ipc.h +++ b/sysvipc/sys/ipc.h @@ -20,10 +20,6 @@ #include <features.h> -#if !defined __USE_MISC && !defined __USE_XOPEN && __GNUC__ >= 2 -# warning "Files using this header must be compiled with _GNU_SOURCE or _XOPEN_SOURCE" -#endif - /* Get system dependent definition of `struct ipc_perm' and more. */ #include <bits/ipctypes.h> #include <bits/ipc.h>