aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time/time.h19
2 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 2105c8a..f1dd278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-25 Ulrich Drepper <drepper@gmail.com>
+
+ * time/time.h: TIME_UTC must be a macro.
+ Make timespec_get available for ISO C11 only as well.
+
2012-02-24 Ulrich Drepper <drepper@gmail.com>
* stdlib/fmtmsg.c (fmtmsg): Lock around use of severity list.
diff --git a/time/time.h b/time/time.h
index 7a1e533..775c092 100644
--- a/time/time.h
+++ b/time/time.h
@@ -179,10 +179,7 @@ typedef __pid_t pid_t;
# ifdef __USE_ISOC11
/* Time base values for timespec_get. */
-enum
- {
- TIME_UTC = 1
- };
+# define TIME_UTC 1
# endif
@@ -362,13 +359,6 @@ extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
# endif
-# ifdef __USE_ISOC11
-/* Set TS to calendar time based in time base BASE. */
-extern int timespec_get (struct timespec *__ts, int __base)
- __THROW __nonnull ((1));
-# endif
-
-
/* Create new per-process timer using CLOCK_ID. */
extern int timer_create (clockid_t __clock_id,
struct sigevent *__restrict __evp,
@@ -391,6 +381,13 @@ extern int timer_getoverrun (timer_t __timerid) __THROW;
# endif
+# ifdef __USE_ISOC11
+/* Set TS to calendar time based in time base BASE. */
+extern int timespec_get (struct timespec *__ts, int __base)
+ __THROW __nonnull ((1));
+# endif
+
+
# ifdef __USE_XOPEN_EXTENDED
/* Set to one of the following values to indicate an error.
1 the DATEMSK environment variable is null or undefined,