summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2007-12-14 18:22:30 +0000
committerroot <root>2007-12-14 18:22:30 +0000
commit4df34d3062cbd5c939ccc8d5577959c3d0954fbd (patch)
treeb7d6cc50061c405b06fab9554bcf47e022754fee
parent3d981a26dbc74027d7d641112e92d299966e4fe7 (diff)
minor fixes
-rw-r--r--ev.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/ev.c b/ev.c
index 1d0a5bf..188970d 100644
--- 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