timers: Createt TimersState and put all timers state there

[qemu] / osdep.h

diff --git a/osdep.h b/osdep.h
index ffbf221..32ee94b 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -36,6 +36,9 @@
         (type *) ((char *) __mptr - offsetof(type, member));})
 #endif
 
+#define typeof_field(type, field) typeof(((type *)0)->field)
+#define type_check(t1,t2) ((t1*)0 - (t2*)0)
+
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
@@ -48,12 +51,9 @@
 #endif
 
 #ifndef always_inline
-#if (__GNUC__ < 3) || defined(__APPLE__)
-#define always_inline inline
-#else
-#define always_inline __attribute__ (( always_inline )) __inline__
+#if !((__GNUC__ < 3) || defined(__APPLE__))
 #ifdef __OPTIMIZE__
-#define inline always_inline
+#define inline __attribute__ (( always_inline )) __inline__
 #endif
 #endif
 #else