aboutsummaryrefslogtreecommitdiff
path: root/src/or/ntmain.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-07-29 21:54:46 -0400
committerNick Mathewson <nickm@torproject.org>2010-07-29 21:54:46 -0400
commit4727adf591c4f8df115a639f67882578314eea8b (patch)
treed466d87c8d8f5ca8a7c3c60a1f7828f5030f562c /src/or/ntmain.c
parenta7b12978cee02f1fbd38887350fa8de5c59040bd (diff)
parentda49a7267fee4e36cd1983158cbce7c1aa10e58a (diff)
downloadtor-4727adf591c4f8df115a639f67882578314eea8b.tar
tor-4727adf591c4f8df115a639f67882578314eea8b.tar.gz
Merge commit 'linus/headers'
Diffstat (limited to 'src/or/ntmain.c')
-rw-r--r--src/or/ntmain.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index 6f349cca6..9bcb7047e 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -5,6 +5,8 @@
#define MAIN_PRIVATE
#include "or.h"
+#include "config.h"
+#include "main.h"
#ifdef HAVE_EVENT2_EVENT_H
#include <event2/event.h>