projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix pointer type mismatch and misplacement of const
[musl]
/
include
/
time.h
diff --git
a/include/time.h
b/include/time.h
index
2f4c74f
..
dc88070
100644
(file)
--- a/
include/time.h
+++ b/
include/time.h
@@
-7,9
+7,8
@@
extern "C" {
#include <features.h>
#include <features.h>
-#undef NULL
#ifdef __cplusplus
#ifdef __cplusplus
-#define NULL 0
+#define NULL 0
L
#else
#define NULL ((void*)0)
#endif
#else
#define NULL ((void*)0)
#endif
@@
-31,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;
@@
-56,7
+60,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) \
@@
-82,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
@@
-113,7
+125,7
@@
struct tm *getdate (const char *);
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-int stime(time_t *);
+int stime(
const
time_t *);
time_t timegm(struct tm *);
#endif
time_t timegm(struct tm *);
#endif