Libc-339.tar.gz

[apple/libc.git] / include / time.h

diff --git a/include/time.h b/include/time.h
index accf7486e7cf2d0a343054b23cd3994addfed8fb..e52c95de3147c4851ce1511c40beaf1b00e4843a 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -67,9 +67,17 @@
 
 #include <machine/ansi.h>
 
-#ifndef        NULL
-#define        NULL    0
-#endif
+#ifndef NULL
+#ifdef __GNUG__
+#define NULL __null
+#else /* ! __GNUG__ */
+#ifndef __cplusplus
+#define NULL ((void *)0)
+#else /* __cplusplus */
+#define NULL 0
+#endif /* ! __cplusplus */
+#endif /* __GNUG__ */
+#endif /* ! NULL */
 
 #ifndef        _BSD_CLOCK_T_DEFINED_
 #define _BSD_CLOCK_T_DEFINED_
@@ -119,34 +127,36 @@ extern char *tzname[];
 #endif
 
 __BEGIN_DECLS
-char *asctime __P((const struct tm *));
-clock_t clock __P((void));
-char *ctime __P((const time_t *));
-double difftime __P((time_t, time_t));
-struct tm *gmtime __P((const time_t *));
-struct tm *localtime __P((const time_t *));
-time_t mktime __P((struct tm *));
-size_t strftime __P((char *, size_t, const char *, const struct tm *));
-time_t time __P((time_t *));
+char *asctime(const struct tm *);
+clock_t clock(void);
+char *ctime(const time_t *);
+double difftime(time_t, time_t);
+struct tm *gmtime(const time_t *);
+struct tm *localtime(const time_t *);
+time_t mktime(struct tm *);
+size_t strftime(char *, size_t, const char *, const struct tm *);
+time_t time(time_t *);
 
 #ifndef _ANSI_SOURCE
-void tzset __P((void));
+void tzset(void);
 #endif /* not ANSI */
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-char *asctime_r __P((const struct tm *, char *));
-char *ctime_r __P((const time_t *, char *));
-struct tm *gmtime_r __P((const time_t *, struct tm *));
-struct tm *localtime_r __P((const time_t *, struct tm *));
-char *strptime __P((const char *, const char *, struct tm *));
-char *timezone __P((int, int));
-void tzsetwall __P((void));
-time_t timelocal __P((struct tm * const));
-time_t timegm __P((struct tm * const));
+char *asctime_r(const struct tm *, char *);
+char *ctime_r(const time_t *, char *);
+struct tm *gmtime_r(const time_t *, struct tm *);
+struct tm *localtime_r(const time_t *, struct tm *);
+time_t posix2time(time_t);
+char *strptime(const char *, const char *, struct tm *);
+char *timezone(int, int);
+void tzsetwall(void);
+time_t time2posix(time_t);
+time_t timelocal(struct tm * const);
+time_t timegm(struct tm * const);
 #endif /* neither ANSI nor POSIX */
 
 #if !defined(_ANSI_SOURCE)
-int nanosleep __P((const struct timespec *, struct timespec *));
+int nanosleep(const struct timespec *, struct timespec *);
 #endif
 __END_DECLS