Changeset 1d2a1a9 in mainline for uspace/lib/posix/time.h

Timestamp:

2011-08-17T20:44:32Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0cc32f2

Parents:

bb285b4 (diff), c53a705 (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) (4 diffs)

uspace/lib/posix/time.h

@@ -119 +119 @@
 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 */
@@ -132 +129 @@
 extern int posix_clock_nanosleep(posix_clockid_t clock_id, int flags,
     const struct posix_timespec *rqtp, struct posix_timespec *rmtp);
-
-#if 0
-
-/* Timers */
-extern int posix_timer_create(posix_clockid_t clockid,
-    struct posix_sigevent *restrict evp,
-    posix_timer_t *restrict timerid);
-extern int posix_timer_delete(posix_timer_t timerid);
-extern int posix_timer_getoverrun(posix_timer_t timerid);
-extern int posix_timer_gettime(posix_timer_t timerid,
-    struct posix_itimerspec *value);
-extern int posix_timer_settime(posix_timer_t timerid, int flags,
-    const struct posix_itimerspec *restrict value,
-    struct posix_itimerspec *restrict ovalue);
-
-#endif
 
 /* CPU Time */
@@ -176 +157 @@
         #define ctime_r posix_ctime_r
         #define strftime posix_strftime
-        #define strftime_l posix_strftime_l
 
         #define clock_getres posix_clock_getres
@@ -182 +162 @@
         #define clock_settime posix_clock_settime
         #define clock_nanosleep posix_clock_nanosleep
-        
-        #define timer_create posix_timer_create
-        #define timer_delete posix_timer_delete
-        #define timer_getoverrun posix_timer_getoverrun
-        #define timer_gettime posix_timer_gettime
-        #define timer_settime posix_timer_settime
-        
+
         #define clock posix_clock
 #endif