more header cleanup and conformance fixes - locale.h, time.h

[musl] / include / time.h

diff --git a/include/time.h b/include/time.h
index e6cfb73..a9e1d8f 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -14,16 +14,19 @@ extern "C" {
 
 
 #define __NEED_time_t
 
 
 #define __NEED_time_t

-#define __NEED_struct_timespec

 #define __NEED_clock_t
 #define __NEED_clock_t

+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+#define __NEED_struct_timespec

 #define __NEED_clockid_t
 #define __NEED_timer_t
 #define __NEED_size_t
 #define __NEED_pid_t
 #define __NEED_clockid_t
 #define __NEED_timer_t
 #define __NEED_size_t
 #define __NEED_pid_t

+#endif

 
 #include <bits/alltypes.h>
 
 
 #include <bits/alltypes.h>
 

-

 struct tm
 {
        int tm_sec;
 struct tm
 {
        int tm_sec;


@@ -39,71 +42,69 @@ struct tm
        const char *__tm_zone;
 };
 
        const char *__tm_zone;
 };
 

-struct itimerspec
-{
-       struct timespec it_interval;
-       struct timespec it_value;
-};
-
-#define CLOCKS_PER_SEC 1000000UL
-
-#define CLOCK_REALTIME           0
-#define CLOCK_MONOTONIC          1
-#define CLOCK_PROCESS_CPUTIME_ID 2
-#define CLOCK_THREAD_CPUTIME_ID  3
-
-#define TIMER_ABSTIME 1
-
-
-

 clock_t clock (void);
 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 *);
 clock_t clock (void);
 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 *);

-char *strptime (const char *, const char *, struct tm *);
-

 struct tm *gmtime (const time_t *);
 struct tm *gmtime (const time_t *);

-struct tm *gmtime_r (const time_t *, struct tm *);

 struct tm *localtime (const time_t *);
 struct tm *localtime (const time_t *);

-struct tm *localtime_r (const time_t *, struct tm *);
-

 char *asctime (const struct tm *);
 char *asctime (const struct tm *);

-char *asctime_r (const struct tm *, char *);

 char *ctime (const time_t *);
 char *ctime (const time_t *);

-char *ctime_r (const time_t *, char *);

 
 

+#define CLOCKS_PER_SEC 1000000UL

 
 

-extern int daylight;
-extern long timezone;
-extern char *tzname[2];

 
 

-void tzset (void);
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)

 
 

+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 *);
+char *ctime_r (const time_t *, char *);

 
 

+void tzset (void);

 
 

-int nanosleep (const struct timespec *, struct timespec *);
+struct itimerspec
+{
+       struct timespec it_interval;
+       struct timespec it_value;
+};

 
 

+#define CLOCK_REALTIME           0
+#define CLOCK_MONOTONIC          1
+#define CLOCK_PROCESS_CPUTIME_ID 2
+#define CLOCK_THREAD_CPUTIME_ID  3
+
+#define TIMER_ABSTIME 1

 
 

+int nanosleep (const struct timespec *, struct timespec *);

 int clock_getres (clockid_t, struct timespec *);
 int clock_gettime (clockid_t, struct timespec *);
 int clock_settime (clockid_t, const struct timespec *);
 int clock_getres (clockid_t, struct timespec *);
 int clock_gettime (clockid_t, struct timespec *);
 int clock_settime (clockid_t, const struct timespec *);

-

 int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *);
 int clock_getcpuclockid (pid_t, clockid_t *);
 
 int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *);
 int clock_getcpuclockid (pid_t, clockid_t *);
 

-/* FIXME */
+/* FIXME..?? */

 struct sigevent;
 int timer_create (clockid_t, struct sigevent *, timer_t *);
 int timer_delete (timer_t);
 struct sigevent;
 int timer_create (clockid_t, struct sigevent *, timer_t *);
 int timer_delete (timer_t);

-

 int timer_settime (timer_t, int, const struct itimerspec *, struct itimerspec *);
 int timer_gettime (timer_t, struct itimerspec *);
 int timer_getoverrun (timer_t);
 
 int timer_settime (timer_t, int, const struct itimerspec *, struct itimerspec *);
 int timer_gettime (timer_t, struct itimerspec *);
 int timer_getoverrun (timer_t);
 

+#endif

 
 

+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+char *strptime (const char *, const char *, struct tm *);
+extern int daylight;
+extern long timezone;
+extern char *tzname[2];

 extern int getdate_err;
 extern struct tm *getdate (const char *);
 extern int getdate_err;
 extern struct tm *getdate (const char *);

+#endif
+

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }