Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix ISO C11 definitions in time.h
  • Loading branch information
Ulrich Drepper committed Feb 26, 2012
1 parent 7724def commit 7a27035
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
5 changes: 5 additions & 0 deletions 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.
Expand Down
19 changes: 8 additions & 11 deletions time/time.h
Expand Up @@ -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


Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 7a27035

Please sign in to comment.