Basic windows libevent fixes

svn:r3366

diff --git a/src/or/or.h b/src/or/or.h
index aecd5e65dda772a78b8ed97034116c7c4611c92b..6c951add118e8e6002e7fc96ceb7fee81f441711 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -96,11 +96,6 @@
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
-#ifdef HAVE_EVENT_H
-#include <event.h>
-#else
-#error "Tor requires libevent to build."
-#endif
 
 #ifdef MS_WINDOWS
 #if (_MSC_VER <= 1300)
@@ -119,6 +114,12 @@
 #define snprintf _snprintf
 #endif
 
+#ifdef HAVE_EVENT_H
+#include <event.h>
+#else
+#error "Tor requires libevent to build."
+#endif
+
 #include "../common/crypto.h"
 #include "../common/tortls.h"
 #include "../common/log.h"

diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index c665eae7a0f480b9409e56f0a79972b18634ce33..60db36b9bd7acb6c0c94e7e7fcb5fdbbda914220 100644 (file)
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -198,5 +198,7 @@
 /* Define to 1 iff unaligned int access is allowed */
 #define UNALIGNED_INT_ACCESS_OK
 
+#define HAVE_EVENT_H
+
 /* Version number of package */
 #define VERSION "0.1.0.0-alpha-cvs"