fix signed/unsigned overflows in SCSI disk (Rik van Riel)

[qemu.git] / osdep.h

diff --git a/osdep.h b/osdep.h
index 9cdfb2c1ce1c337cd9bf9f5cb8b778d9f920e2bf..ffbf221d7f540f3aaf2f93a3e77d6032931c77b6 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -7,6 +7,10 @@
 #include <sys/signal.h>
 #endif
 
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+
 #ifndef glue
 #define xglue(x, y) x ## y
 #define glue(x, y) xglue(x, y)
@@ -64,7 +68,7 @@
 
 #define qemu_printf printf
 
-#if defined (__GNUC__) && defined (__GNUC_MINOR_)
+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
 # define QEMU_GNUC_PREREQ(maj, min) \
          ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
 #else