summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-01-18 23:44:55 +0000
committerNick Mathewson <nickm@torproject.org>2005-01-18 23:44:55 +0000
commit7d4a167c81294b0270438cd1b98758e47a0f41a6 (patch)
tree7a374ed3a16c0a595011ced15c3479cf00017c9d
parent84deb5c690f01226fe1106e90683ba817a539eb9 (diff)
downloadtor-7d4a167c81294b0270438cd1b98758e47a0f41a6.tar.gz
tor-7d4a167c81294b0270438cd1b98758e47a0f41a6.zip
Basic windows libevent fixes
svn:r3366
-rw-r--r--src/or/or.h11
-rw-r--r--src/win32/orconfig.h2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/or/or.h b/src/or/or.h
index aecd5e65dd..6c951add11 100644
--- 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 c665eae7a0..60db36b9bd 100644
--- 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"