Changeset 055a68a in mainline for uspace/lib/c/include/sys/time.h

Timestamp:

2015-04-23T23:47:40Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

a18a8b9

Parents:

acb8766e (diff), dcba819 (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 mainline changes

File:

• uspace/lib/c/include/sys/time.h (modified) (3 diffs)

uspace/lib/c/include/sys/time.h

@@ -50 +50 @@
 
 struct tm {
+        int tm_usec;   /* Microseconds [0,999999]. */
         int tm_sec;    /* Seconds [0,60]. */
         int tm_min;    /* Minutes [0,59]. */
@@ -71 +72 @@
 };
 
-extern void tv_add(struct timeval *, suseconds_t);
-extern suseconds_t tv_sub(struct timeval *, struct timeval *);
+extern void tv_add_diff(struct timeval *, suseconds_t);
+extern void tv_add(struct timeval *, struct timeval *);
+extern suseconds_t tv_sub_diff(struct timeval *, struct timeval *);
+extern void tv_sub(struct timeval *, struct timeval *);
 extern int tv_gt(struct timeval *, struct timeval *);
 extern int tv_gteq(struct timeval *, struct timeval *);
@@ -85 +88 @@
 extern int time_utc2str(const time_t, char *);
 extern void time_tm2str(const struct tm *, char *);
+extern int time_tv2tm(const struct timeval *, struct tm *);
 extern int time_local2tm(const time_t, struct tm *);
 extern int time_local2str(const time_t, char *);