Fix a couple of win32-related build issues when using latest libevent.

svn:r3978

Win32Build/vc7/tor_resolve/tor_resolve.vcproj

@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\win32"
+				AdditionalIncludeDirectories="..\..\..\contrib\libevent;..\..\..\src\win32"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="wsock32.lib ..\..\..\contrib\libevent\win32-prj\Debug\libevent.lib"
 				OutputFile="$(OutDir)/tor_resolve.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -68,7 +68,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\src\win32"
+				AdditionalIncludeDirectories="..\..\..\contrib\libevent;..\..\..\src\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -79,7 +79,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
+				AdditionalDependencies="wsock32.lib ..\..\..\contrib\libevent\win32-prj\Debug\libevent.lib"
 				OutputFile="$(OutDir)/tor_resolve.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"

src/win32/orconfig.h

@@ -20,6 +20,15 @@
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H
 
+/* Define to 1 if you have the `event_get_method' function. */
+#define HAVE_EVENT_GET_METHOD 1
+
+/* Define to 1 if you have the `event_get_version' function. */
+#define HAVE_EVENT_GET_VERSION 1
+
+/* Define to 1 if you have the `event_set_log_callback' function. */
+#define HAVE_EVENT_SET_LOG_CALLBACK 1
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H