diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-04-01 16:48:22 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-04-01 16:48:22 +0000 |
| commit | 36631d6401d3a2022cdcb9d11fc294fb58114698 (patch) | |
| tree | ef310cc1cf828ee326198cfe9682b6651ce1616d | |
| parent | 998846f1d629e7796ee6977c55988751aa0ec632 (diff) | |
| download | tor-36631d6401d3a2022cdcb9d11fc294fb58114698.tar.gz tor-36631d6401d3a2022cdcb9d11fc294fb58114698.zip | |
Fix a couple of win32-related build issues when using latest libevent.
svn:r3978
| -rwxr-xr-x | Win32Build/vc7/tor_resolve/tor_resolve.vcproj | 8 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/Win32Build/vc7/tor_resolve/tor_resolve.vcproj b/Win32Build/vc7/tor_resolve/tor_resolve.vcproj index 5e4cad3598..a44f1ac66a 100755 --- a/Win32Build/vc7/tor_resolve/tor_resolve.vcproj +++ b/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" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index bfe9b2a5a9..ababc5f506 100644 --- a/src/win32/orconfig.h +++ b/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 |