Merge some pre-work from branch, needed by NPTL.

[uclinux-h8/uClibc.git] / include / time.h

diff --git a/include/time.h b/include/time.h
index 84e17f3..4f060be 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999,2000,2001,2002,2003,2006
+       Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -113,6 +114,8 @@ typedef __timer_t timer_t;
       defined __need_timespec)
 # define __timespec_defined    1
 
+# include <bits/types.h>       /* This defines __time_t for us.  */
+
 /* POSIX.1b structure for a time value.  This is like a `struct timeval' but
    has nanoseconds instead of microseconds.  */
 struct timespec
@@ -184,6 +187,7 @@ extern clock_t clock (void) __THROW;
 
 /* Return the current time and put it in *TIMER if TIMER is not NULL.  */
 extern time_t time (time_t *__timer) __THROW;
+libc_hidden_proto(time)
 
 #ifdef __UCLIBC_HAS_FLOATS__
 /* Return the difference between TIME1 and TIME0.  */
@@ -191,6 +195,8 @@ extern double difftime (time_t __time1, time_t __time0)
      __THROW __attribute__ ((__const__));
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
+#define CLOCK_IDFIELD_SIZE     3
+
 /* Return the `time_t' representation of TP and normalize TP.  */
 extern time_t mktime (struct tm *__tp) __THROW;
 
@@ -201,6 +207,7 @@ extern time_t mktime (struct tm *__tp) __THROW;
 extern size_t strftime (char *__restrict __s, size_t __maxsize,
                        __const char *__restrict __format,
                        __const struct tm *__restrict __tp) __THROW;
+libc_hidden_proto(strftime)
 __END_NAMESPACE_STD
 
 # ifdef __USE_XOPEN
@@ -209,6 +216,7 @@ __END_NAMESPACE_STD
 extern char *strptime (__const char *__restrict __s,
                       __const char *__restrict __fmt, struct tm *__tp)
      __THROW;
+libc_hidden_proto(strptime)
 # endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
@@ -221,10 +229,12 @@ extern size_t strftime_l (char *__restrict __s, size_t __maxsize,
                          __const char *__restrict __format,
                          __const struct tm *__restrict __tp,
                          __locale_t __loc) __THROW;
+libc_hidden_proto(strftime_l)
 
 extern char *strptime_l (__const char *__restrict __s,
                         __const char *__restrict __fmt, struct tm *__tp,
                         __locale_t __loc) __THROW;
+libc_hidden_proto(strptime_l)
 # endif
 #endif
 
@@ -237,6 +247,7 @@ extern struct tm *gmtime (__const time_t *__timer) __THROW;
 /* Return the `struct tm' representation
    of *TIMER in the local timezone.  */
 extern struct tm *localtime (__const time_t *__timer) __THROW;
+libc_hidden_proto(localtime)
 __END_NAMESPACE_STD
 
 # if defined __USE_POSIX || defined __USE_MISC
@@ -249,15 +260,18 @@ extern struct tm *gmtime_r (__const time_t *__restrict __timer,
    using *TP to store the result.  */
 extern struct tm *localtime_r (__const time_t *__restrict __timer,
                               struct tm *__restrict __tp) __THROW;
+libc_hidden_proto(localtime_r)
 # endif        /* POSIX or misc */
 
 __BEGIN_NAMESPACE_STD
 /* Return a string of the form "Day Mon dd hh:mm:ss yyyy\n"
    that is the representation of TP in this format.  */
 extern char *asctime (__const struct tm *__tp) __THROW;
+libc_hidden_proto(asctime)
 
 /* Equivalent to `asctime (localtime (timer))'.  */
 extern char *ctime (__const time_t *__timer) __THROW;
+libc_hidden_proto(ctime)
 __END_NAMESPACE_STD
 
 # if defined __USE_POSIX || defined __USE_MISC
@@ -267,6 +281,7 @@ __END_NAMESPACE_STD
    that is the representation of TP in this format.  */
 extern char *asctime_r (__const struct tm *__restrict __tp,
                        char *__restrict __buf) __THROW;
+libc_hidden_proto(asctime_r)
 
 /* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'.  */
 extern char *ctime_r (__const time_t *__restrict __timer,
@@ -290,6 +305,7 @@ extern char *tzname[2];
 /* Set time conversion information from the TZ environment variable.
    If TZ is not defined, a locale-dependent default is used.  */
 extern void tzset (void) __THROW;
+libc_hidden_proto(tzset)
 # endif
 
 # if defined __USE_SVID || defined __USE_XOPEN
@@ -326,26 +342,30 @@ extern int dysize (int __year) __THROW  __attribute__ ((__const__));
 
 
 # ifdef __USE_POSIX199309
+#  if defined __UCLIBC_HAS_REALTIME__
 /* Pause execution for a number of nanoseconds.
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int nanosleep (__const struct timespec *__requested_time,
                      struct timespec *__remaining);
+libc_hidden_proto(nanosleep)
 
 
 /* Get resolution of clock CLOCK_ID.  */
 extern int clock_getres (clockid_t __clock_id, struct timespec *__res) __THROW;
+libc_hidden_proto(clock_getres)
 
 /* Get current value of clock CLOCK_ID and store it in TP.  */
 extern int clock_gettime (clockid_t __clock_id, struct timespec *__tp) __THROW;
 
 /* Set clock CLOCK_ID to value TP.  */
-extern int clock_settime (clockid_t __clock_id, __const struct timespec *__tp) __THROW;
-
+extern int clock_settime (clockid_t __clock_id, __const struct timespec *__tp)
+     __THROW;
+#endif /* __UCLIBC_HAS_REALTIME__ */
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning "mjn3 FIXME: a bunch of unimplemented function prototypes."
-#  ifdef __USE_XOPEN2K
+#  if defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__
 /* High-resolution sleep with the specified clock.
 
    This function is a cancellation point and therefore not marked with
@@ -357,8 +377,9 @@ extern int clock_nanosleep (clockid_t __clock_id, int __flags,
 /* Return clock ID for CPU-time clock.  */
 extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
 #  endif
+#endif /* __UCLIBC_MJN3_ONLY__ */
 
-
+#  if defined __UCLIBC_HAS_REALTIME__
 /* Create new per-process timer using CLOCK_ID.  */
 extern int timer_create (clockid_t __clock_id,
                         struct sigevent *__restrict __evp,
@@ -378,8 +399,8 @@ extern int timer_gettime (timer_t __timerid, struct itimerspec *__value)
 
 /* Get expiration overrun for timer TIMERID.  */
 extern int timer_getoverrun (timer_t __timerid) __THROW;
-#endif /* __UCLIBC_MJN3_ONLY__ */
-# endif
+#  endif /* __UCLIBC_HAS_REALTIME__ */
+# endif /* __USE_POSIX199309 */
 
 
 #ifdef __UCLIBC_MJN3_ONLY__