Merge remote branch 'qemu-kvm/uq/master' into staging

[qemu.git] / osdep.h

diff --git a/osdep.h b/osdep.h
index 748df5416ba26edb4258fa2aaab3afc999e70e15..970d767078b6760e3da4cd6489d011bf6e34de34 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -8,9 +8,7 @@
 #include <sys/signal.h>
 #endif
 
-#ifndef _WIN32
 #include <sys/time.h>
-#endif
 
 #ifndef glue
 #define xglue(x, y) x ## y
@@ -132,4 +130,21 @@ int qemu_madvise(void *addr, size_t len, int advice);
 int qemu_create_pidfile(const char *filename);
 int qemu_get_thread_id(void);
 
+#ifdef _WIN32
+static inline void qemu_timersub(const struct timeval *val1,
+                                 const struct timeval *val2,
+                                 struct timeval *res)
+{
+    res->tv_sec = val1->tv_sec - val2->tv_sec;
+    if (val1->tv_usec < val2->tv_usec) {
+        res->tv_sec--;
+        res->tv_usec = val1->tv_usec - val2->tv_usec + 1000 * 1000;
+    } else {
+        res->tv_usec = val1->tv_usec - val2->tv_usec;
+    }
+}
+#else
+#define qemu_timersub timersub
+#endif
+
 #endif