X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=osdep.h;h=ffbf221d7f540f3aaf2f93a3e77d6032931c77b6;hb=bf9b48af99a75a1f7d76c8b3d92a82a0a41cb707;hp=87f024b127ce2a75c1d315dff89c69ca0206cb81;hpb=c2b48b69cb80170b749b4252f7eb78acbb370879;p=qemu

diff --git a/osdep.h b/osdep.h
index 87f024b..ffbf221 100644
--- 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)
@@ -48,8 +52,10 @@
 #define always_inline inline
 #else
 #define always_inline __attribute__ (( always_inline )) __inline__
+#ifdef __OPTIMIZE__
 #define inline always_inline
 #endif
+#endif
 #else
 #define inline always_inline
 #endif
@@ -62,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