projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bogus lazy allocation in ctermid and missing malloc failure check
[musl]
/
include
/
time.h
diff --git
a/include/time.h
b/include/time.h
index
fbc47db
..
5b3dde5
100644
(file)
--- a/
include/time.h
+++ b/
include/time.h
@@
-7,13
+7,7
@@
extern "C" {
#include <features.h>
#include <features.h>
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
-
+#define NULL 0L
#define __NEED_size_t
#define __NEED_time_t
#define __NEED_size_t
#define __NEED_time_t
@@
-31,6
+25,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;
@@
-45,10
+44,6
@@
struct tm
long __tm_gmtoff;
const char *__tm_zone;
};
long __tm_gmtoff;
const char *__tm_zone;
};
-#if defined(_BSD_SOURCE)
-#define tm_gmtoff __tm_gmtoff
-#define tm_zone __tm_zone
-#endif
clock_t clock (void);
time_t time (time_t *);
clock_t clock (void);
time_t time (time_t *);
@@
-60,7
+55,7
@@
struct tm *localtime (const time_t *);
char *asctime (const struct tm *);
char *ctime (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) \
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
@@
-86,6
+81,12
@@
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_COURSE 5
+#define CLOCK_MONOTONIC_COURSE 6
+#define CLOCK_BOOTTIME 7
+#define CLOCK_REALTIME_ALARM 8
+#define CLOCK_BOOTTIME_ALARM 9
#define TIMER_ABSTIME 1
#define TIMER_ABSTIME 1