projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix signal.h breakage from moving stack_t to arch-specific bits
[musl]
/
include
/
time.h
diff --git
a/include/time.h
b/include/time.h
index
ecdc66d
..
dc88070
100644
(file)
--- a/
include/time.h
+++ b/
include/time.h
@@
-5,9
+5,10
@@
extern "C" {
#endif
extern "C" {
#endif
-#undef NULL
+#include <features.h>
+
#ifdef __cplusplus
#ifdef __cplusplus
-#define NULL 0
+#define NULL 0
L
#else
#define NULL ((void*)0)
#endif
#else
#define NULL ((void*)0)
#endif
@@
-29,6
+30,11
@@
extern "C" {
#include <bits/alltypes.h>
#include <bits/alltypes.h>
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define __tm_gmtoff tm_gmtoff
+#define __tm_zone tm_zone
+#endif
+
struct tm
{
int tm_sec;
struct tm
{
int tm_sec;
@@
-48,24
+54,24
@@
clock_t clock (void);
time_t time (time_t *);
double difftime (time_t, time_t);
time_t mktime (struct tm *);
time_t time (time_t *);
double difftime (time_t, time_t);
time_t mktime (struct tm *);
-size_t strftime (char *
, size_t, const char *, const struct tm *
);
+size_t strftime (char *
__restrict, size_t, const char *__restrict, const struct tm *__restrict
);
struct tm *gmtime (const time_t *);
struct tm *localtime (const time_t *);
char *asctime (const struct tm *);
char *ctime (const time_t *);
struct tm *gmtime (const time_t *);
struct tm *localtime (const time_t *);
char *asctime (const struct tm *);
char *ctime (const time_t *);
-#define CLOCKS_PER_SEC 1000000
U
L
+#define CLOCKS_PER_SEC 1000000L
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
-size_t strftime_l (char *
, size_t, const char *, const struct tm *
, locale_t);
+size_t strftime_l (char *
__restrict, size_t, const char * __restrict, const struct tm * __restrict
, locale_t);
-struct tm *gmtime_r (const time_t *
, struct tm *
);
-struct tm *localtime_r (const time_t *
, struct tm *
);
-char *asctime_r (const struct tm *
, char *
);
+struct tm *gmtime_r (const time_t *
__restrict, struct tm *__restrict
);
+struct tm *localtime_r (const time_t *
__restrict, struct tm *__restrict
);
+char *asctime_r (const struct tm *
__restrict, char *__restrict
);
char *ctime_r (const time_t *, char *);
void tzset (void);
char *ctime_r (const time_t *, char *);
void tzset (void);
@@
-80,6
+86,14
@@
struct itimerspec
#define CLOCK_MONOTONIC 1
#define CLOCK_PROCESS_CPUTIME_ID 2
#define CLOCK_THREAD_CPUTIME_ID 3
#define CLOCK_MONOTONIC 1
#define CLOCK_PROCESS_CPUTIME_ID 2
#define CLOCK_THREAD_CPUTIME_ID 3
+#define CLOCK_MONOTONIC_RAW 4
+#define CLOCK_REALTIME_COARSE 5
+#define CLOCK_MONOTONIC_COARSE 6
+#define CLOCK_BOOTTIME 7
+#define CLOCK_REALTIME_ALARM 8
+#define CLOCK_BOOTTIME_ALARM 9
+#define CLOCK_SGI_CYCLE 10
+#define CLOCK_TAI 11
#define TIMER_ABSTIME 1
#define TIMER_ABSTIME 1
@@
-91,9
+105,9
@@
int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *)
int clock_getcpuclockid (pid_t, clockid_t *);
struct sigevent;
int clock_getcpuclockid (pid_t, clockid_t *);
struct sigevent;
-int timer_create (clockid_t, struct sigevent *
, timer_t *
);
+int timer_create (clockid_t, struct sigevent *
__restrict, timer_t *__restrict
);
int timer_delete (timer_t);
int timer_delete (timer_t);
-int timer_settime (timer_t, int, const struct itimerspec *
, struct itimerspec *
);
+int timer_settime (timer_t, int, const struct itimerspec *
__restrict, struct itimerspec *__restrict
);
int timer_gettime (timer_t, struct itimerspec *);
int timer_getoverrun (timer_t);
int timer_gettime (timer_t, struct itimerspec *);
int timer_getoverrun (timer_t);
@@
-101,7
+115,7
@@
int timer_getoverrun (timer_t);
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-char *strptime (const char *
, const char *, struct tm *
);
+char *strptime (const char *
__restrict, const char *__restrict, struct tm *__restrict
);
extern int daylight;
extern long timezone;
extern char *tzname[2];
extern int daylight;
extern long timezone;
extern char *tzname[2];
@@
-110,11
+124,8
@@
struct tm *getdate (const char *);
#endif
#endif
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-int stime(time_t *);
-#endif
-
-#if defined(_GNU_SOURCE)
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+int stime(const time_t *);
time_t timegm(struct tm *);
#endif
time_t timegm(struct tm *);
#endif