minor fixes

diff --git a/ev.c b/ev.c
index 1d0a5bf4b793fb5196a2363e01aa9d71b421fbd5..188970d362865f0e8c22a959a3823a8cefd992c3 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -204,11 +204,8 @@ extern "C" {
 # define EV_USE_REALTIME 0
 #endif
 
-#if EV_SELECT_IS_WINSOCKET
-# include <winsock.h>
-#endif
-
 #if !EV_STAT_ENABLE
+# undef EV_USE_INOTIFY
 # define EV_USE_INOTIFY 0
 #endif
 
@@ -216,6 +213,10 @@ extern "C" {
 # include <sys/inotify.h>
 #endif
 
+#if EV_SELECT_IS_WINSOCKET
+# include <winsock.h>
+#endif
+
 /**/
 
 /*
@@ -232,7 +233,7 @@ extern "C" {
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
 /*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
 
-#if __GNUC__ >= 3
+#if __GNUC__ >= 4
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define noinline                   __attribute__ ((noinline))
 #else