fix some aliasing issues again

[software/libev.git] / event_compat.h

diff --git a/event_compat.h b/event_compat.h
index 258a83fb09acbc99290cdc8eabb4650b0d964e6a..3fb0908cfcdf422f8215f8ab93f24aa4e8699404 100644 (file)
--- a/event_compat.h
+++ b/event_compat.h
@@ -28,18 +28,20 @@
 extern "C" {
 #endif
 
-#include <sys/time.h>
-#include <stdint.h>
-#include <stdarg.h>
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
+#ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# undef WIN32_LEAN_AND_MEAN
 typedef unsigned char u_char;
 typedef unsigned short u_short;
+#else
+# include <sys/types.h>
+# include <sys/time.h>
+# include <inttypes.h>
 #endif
 
+#include <stdarg.h>
+
 /* Fix so that ppl dont have to run with <sys/queue.h> */
 #ifndef TAILQ_ENTRY
 #define _EVENT_DEFINED_TQENTRY