diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-03-03 18:18:04 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-03-03 18:18:04 +0000 |
| commit | c0102611b1f1bd1ce2a2952e9b74ff33fa02717e (patch) | |
| tree | 31177266a6797f3c30d0493619d0f06f3f59afe1 /libc/time | |
| parent | 33f3f8954d202664c7c7a224d13ba5a0c14a0e01 (diff) | |
| download | eglibc2-c0102611b1f1bd1ce2a2952e9b74ff33fa02717e.tar.gz | |
Merge changes between r17194 and r17384 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17385 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/time')
| -rw-r--r-- | libc/time/time.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libc/time/time.h b/libc/time/time.h index 7a1e5338d..775c0927e 100644 --- a/libc/time/time.h +++ b/libc/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, |