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

This commit is contained in:
Rich Felker 2011-02-14 20:45:37 -05:00
parent 1322cb82a3
commit 131b5be2f4
2 changed files with 40 additions and 38 deletions

View File

@ -53,7 +53,8 @@ char *setlocale (int, const char *);
struct lconv *localeconv(void); struct lconv *localeconv(void);
#if 1 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
#define __NEED_locale_t #define __NEED_locale_t

View File

@ -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_clockid_t
#define __NEED_timer_t #define __NEED_timer_t
#define __NEED_size_t #define __NEED_size_t
#define __NEED_pid_t #define __NEED_pid_t
#endif
#include <bits/alltypes.h> #include <bits/alltypes.h>
struct tm struct tm
{ {
int tm_sec; int tm_sec;
@ -39,14 +42,35 @@ struct tm
const char *__tm_zone; const char *__tm_zone;
}; };
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 *);
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 1000000UL
#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);
struct itimerspec struct itimerspec
{ {
struct timespec it_interval; struct timespec it_interval;
struct timespec it_value; struct timespec it_value;
}; };
#define CLOCKS_PER_SEC 1000000UL
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#define CLOCK_MONOTONIC 1 #define CLOCK_MONOTONIC 1
#define CLOCK_PROCESS_CPUTIME_ID 2 #define CLOCK_PROCESS_CPUTIME_ID 2
@ -54,56 +78,33 @@ struct itimerspec
#define TIMER_ABSTIME 1 #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 *);
char *strptime (const char *, const char *, struct tm *);
struct tm *gmtime (const time_t *);
struct tm *gmtime_r (const time_t *, struct tm *);
struct tm *localtime (const time_t *);
struct tm *localtime_r (const time_t *, struct tm *);
char *asctime (const struct tm *);
char *asctime_r (const struct tm *, char *);
char *ctime (const time_t *);
char *ctime_r (const time_t *, char *);
extern int daylight;
extern long timezone;
extern char *tzname[2];
void tzset (void);
int nanosleep (const struct timespec *, struct timespec *); int nanosleep (const struct timespec *, struct timespec *);
int clock_getres (clockid_t, struct timespec *); int clock_getres (clockid_t, struct timespec *);
int clock_gettime (clockid_t, struct timespec *); int clock_gettime (clockid_t, struct timespec *);
int clock_settime (clockid_t, const struct timespec *); int clock_settime (clockid_t, const struct timespec *);
int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *); int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *);
int clock_getcpuclockid (pid_t, clockid_t *); int clock_getcpuclockid (pid_t, clockid_t *);
/* FIXME */ /* FIXME..?? */
struct sigevent; struct sigevent;
int timer_create (clockid_t, struct sigevent *, timer_t *); int timer_create (clockid_t, struct sigevent *, timer_t *);
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 *, struct itimerspec *);
int timer_gettime (timer_t, struct itimerspec *); int timer_gettime (timer_t, struct itimerspec *);
int timer_getoverrun (timer_t); 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 int getdate_err;
extern struct tm *getdate (const char *); extern struct tm *getdate (const char *);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }