svn commit: r363193 - in head: include sys/sys

[Konstantin Belousov]

Author: kib
Date: Tue Jul 14 20:23:27 2020
New Revision: 363193
URL: https://svnweb.freebsd.org/changeset/base/363193

Log:
  Make CLOCK_REALTIME and TIMER_ABSTIME available for XOPEN_SOURCE >= 500.
  
  Reported by:	jbeich
  PR:	247701
  Reviewed by:	jilles
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week
  Differential revision:	https://reviews.freebsd.org/D25554

Modified:
  head/include/time.h
  head/sys/sys/time.h

Modified: head/include/time.h
==============================================================================
--- head/include/time.h	Tue Jul 14 18:57:31 2020	(r363192)
+++ head/include/time.h	Tue Jul 14 20:23:27 2020	(r363193)
@@ -98,12 +98,14 @@ typedef	__pid_t		pid_t;
 #endif
 
 /* These macros are also in sys/time.h. */
-#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112
+#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 199506
 #define CLOCK_REALTIME	0
-#ifdef __BSD_VISIBLE
+#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 199506 */
+#if !defined(CLOCK_VIRTUAL) && __BSD_VISIBLE
 #define CLOCK_VIRTUAL	1
 #define CLOCK_PROF	2
-#endif
+#endif /* !defined(CLOCK_VIRTUAL) && __BSD_VISIBLE */
+#if !defined(CLOCK_MONOTONIC) && __POSIX_VISIBLE >= 200112
 #define CLOCK_MONOTONIC	4
 #define CLOCK_UPTIME	5		/* FreeBSD-specific. */
 #define CLOCK_UPTIME_PRECISE	7	/* FreeBSD-specific. */
@@ -115,14 +117,14 @@ typedef	__pid_t		pid_t;
 #define CLOCK_SECOND	13		/* FreeBSD-specific. */
 #define CLOCK_THREAD_CPUTIME_ID	14
 #define	CLOCK_PROCESS_CPUTIME_ID	15
-#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
+#endif /* !defined(CLOCK_MONOTONIC) && __POSIX_VISIBLE >= 200112 */
 
-#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112
 #if __BSD_VISIBLE
 #define TIMER_RELTIME	0x0	/* relative timer */
 #endif
+#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 199506
 #define TIMER_ABSTIME	0x1	/* absolute timer */
-#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 */
+#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 199506 */
 
 struct tm {
 	int	tm_sec;		/* seconds after the minute [0-60] */

Modified: head/sys/sys/time.h
==============================================================================
--- head/sys/sys/time.h	Tue Jul 14 18:57:31 2020	(r363192)
+++ head/sys/sys/time.h	Tue Jul 14 20:23:27 2020	(r363193)
@@ -463,8 +463,12 @@ struct clockinfo {
 /* These macros are also in time.h. */
 #ifndef CLOCK_REALTIME
 #define	CLOCK_REALTIME	0
+#endif
+#ifndef CLOCK_VIRTUAL
 #define	CLOCK_VIRTUAL	1
 #define	CLOCK_PROF	2
+#endif
+#ifndef CLOCK_MONOTONIC
 #define	CLOCK_MONOTONIC	4
 #define	CLOCK_UPTIME	5		/* FreeBSD-specific. */
 #define	CLOCK_UPTIME_PRECISE	7	/* FreeBSD-specific. */