ofp-actions: Fix userspace support for mpls_ttl.

[mirror_ovs.git] / lib / timeval.h

diff --git a/lib/timeval.h b/lib/timeval.h
index 99b3af04c4b348debb285670c659b2385c16a9c1..502f703d4c254eefad4ad9e784301dfea0cbc473 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -18,7 +18,7 @@
 #define TIMEVAL_H 1
 
 #include <time.h>
-#include "type-props.h"
+#include "openvswitch/type-props.h"
 #include "util.h"
 
 #ifdef  __cplusplus
@@ -40,6 +40,11 @@ BUILD_ASSERT_DECL(TYPE_IS_SIGNED(time_t));
 #define TIME_MAX TYPE_MAXIMUM(time_t)
 #define TIME_MIN TYPE_MINIMUM(time_t)
 
+#ifdef _WIN32
+#define localtime_r(timep, result) localtime_s(result, timep)
+#define gmtime_r(timep, result) gmtime_s(result, timep)
+#endif /* _WIN32 */
+
 struct tm_msec {
   struct tm tm;
   int msec;
@@ -49,14 +54,18 @@ time_t time_now(void);
 time_t time_wall(void);
 long long int time_msec(void);
 long long int time_wall_msec(void);
+long long int time_usec(void);
+long long int time_wall_usec(void);
 void time_timespec(struct timespec *);
 void time_wall_timespec(struct timespec *);
 void time_alarm(unsigned int secs);
-int time_poll(struct pollfd *, int n_pollfds, long long int timeout_when,
-              int *elapsed);
+int time_poll(struct pollfd *, int n_pollfds, HANDLE *handles,
+              long long int timeout_when, int *elapsed);
 
 long long int timespec_to_msec(const struct timespec *);
+long long int timespec_to_usec(const struct timespec *);
 long long int timeval_to_msec(const struct timeval *);
+long long int timeval_to_usec(const struct timeval *);
 
 struct tm_msec *localtime_msec(long long int now, struct tm_msec *result);
 struct tm_msec *gmtime_msec(long long int now, struct tm_msec *result);
@@ -64,11 +73,14 @@ size_t strftime_msec(char *s, size_t max, const char *format,
                      const struct tm_msec *);
 void xgettimeofday(struct timeval *);
 void xclock_gettime(clock_t, struct timespec *);
+void nsec_to_timespec(long long int, struct timespec *);
 
 int get_cpu_usage(void);
 
 long long int time_boot_msec(void);
 
+void timewarp_run(void);
+
 #ifdef  __cplusplus
 }
 #endif