Changeset eccd20e6 in mainline for uspace/lib/posix/time.h

Timestamp:

2011-07-21T22:34:14Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c6f4681, e478cebf

Parents:

df0956ee (diff), cfbb5d18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

File:

• uspace/lib/posix/time.h (modified) (7 diffs)

uspace/lib/posix/time.h

@@ -31 +31 @@
  * @{
  */
-/** @file
+/** @file Time measurement support.
  */
 
@@ -94 +94 @@
 
 /* Timezones */
-
 extern int posix_daylight;
 extern long posix_timezone;
 extern char *posix_tzname[2];
-
 extern void posix_tzset(void);
 
-/* time_t */
-
+/* Elapsed Time */
 extern double posix_difftime(time_t time1, time_t time0);
 
 /* Broken-down Time */
-extern time_t posix_mktime(struct posix_tm *timeptr);
+extern time_t posix_mktime(struct posix_tm *tm);
 extern struct posix_tm *posix_gmtime(const time_t *timer);
 extern struct posix_tm *posix_gmtime_r(const time_t *restrict timer,
@@ -120 +117 @@
 extern char *posix_ctime(const time_t *timer);
 extern char *posix_ctime_r(const time_t *timer, char *buf);
-
 extern size_t posix_strftime(char *restrict s, size_t maxsize,
     const char *restrict format, const struct posix_tm *restrict tm);
-
 extern size_t posix_strftime_l(char *restrict s, size_t maxsize,
     const char *restrict format, const struct posix_tm *restrict tm,
     posix_locale_t loc);
 
-/* Clocks. */
-
+/* Clocks */
 extern int posix_clock_getres(posix_clockid_t clock_id,
     struct posix_timespec *res);
@@ -139 +133 @@
     const struct posix_timespec *rqtp, struct posix_timespec *rmtp);
 
-/* Timers. */
-
 #if 0
 
+/* Timers */
 extern int posix_timer_create(posix_clockid_t clockid,
     struct posix_sigevent *restrict evp,
@@ -159 +152 @@
 extern posix_clock_t posix_clock(void);
 
-
 #ifndef LIBPOSIX_INTERNAL
         #define tm posix_tm
-
         #define timespec posix_timespec
         #define itimerspec posix_itimerspec
         #define timer_t posix_timer_t
 
+        #define daylight posix_daylight
+        #define timezone posix_timezone
+        #define tzname posix_tzname
+        #define tzset posix_tzset
+
         #define difftime posix_difftime
+
         #define mktime posix_mktime
         #define gmtime posix_gmtime
@@ -174 +171 @@
         #define localtime_r posix_localtime_r
 
-        #define daylight posix_daylight
-        #define timezone posix_timezone
-        #define tzname posix_tzname
-        #define tzset posix_tzset
-
         #define asctime posix_asctime
         #define asctime_r posix_asctime_r
@@ -184 +176 @@
         #define ctime_r posix_ctime_r
         #define strftime posix_strftime
+        #define strftime_l posix_strftime_l
 
         #define clock_getres posix_clock_getres