clean up windows build
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@11 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
parent
7e3412baf1
commit
4ce6cb1cf9
|
@ -45,10 +45,14 @@
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="3"
|
RuntimeLibrary="3"
|
||||||
|
DisableLanguageExtensions="true"
|
||||||
|
RuntimeTypeInfo="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="4"
|
WarningLevel="4"
|
||||||
|
WarnAsError="true"
|
||||||
Detect64BitPortabilityProblems="true"
|
Detect64BitPortabilityProblems="true"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -106,10 +110,14 @@
|
||||||
AdditionalIncludeDirectories="src/include"
|
AdditionalIncludeDirectories="src/include"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
|
DisableLanguageExtensions="true"
|
||||||
|
RuntimeTypeInfo="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="4"
|
WarningLevel="4"
|
||||||
|
WarnAsError="true"
|
||||||
Detect64BitPortabilityProblems="true"
|
Detect64BitPortabilityProblems="true"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -171,6 +179,22 @@
|
||||||
<File
|
<File
|
||||||
RelativePath=".\src\zap_wanpipe.c"
|
RelativePath=".\src\zap_wanpipe.c"
|
||||||
>
|
>
|
||||||
|
<FileConfiguration
|
||||||
|
Name="Debug|Win32"
|
||||||
|
ExcludedFromBuild="true"
|
||||||
|
>
|
||||||
|
<Tool
|
||||||
|
Name="VCCLCompilerTool"
|
||||||
|
/>
|
||||||
|
</FileConfiguration>
|
||||||
|
<FileConfiguration
|
||||||
|
Name="Release|Win32"
|
||||||
|
ExcludedFromBuild="true"
|
||||||
|
>
|
||||||
|
<Tool
|
||||||
|
Name="VCCLCompilerTool"
|
||||||
|
/>
|
||||||
|
</FileConfiguration>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\src\zap_zt.c"
|
RelativePath=".\src\zap_zt.c"
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#define _XOPEN_SOURCE 500
|
#define _XOPEN_SOURCE 500
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#if (_MSC_VER >= 1400) // VC8+
|
#if (_MSC_VER >= 1400) /* VC8+ */
|
||||||
#ifndef _CRT_SECURE_NO_DEPRECATE
|
#ifndef _CRT_SECURE_NO_DEPRECATE
|
||||||
#define _CRT_SECURE_NO_DEPRECATE
|
#define _CRT_SECURE_NO_DEPRECATE
|
||||||
#endif
|
#endif
|
||||||
|
@ -63,6 +63,11 @@
|
||||||
#include "hashtable.h"
|
#include "hashtable.h"
|
||||||
#include "zap_config.h"
|
#include "zap_config.h"
|
||||||
|
|
||||||
|
#ifdef NDEBUG
|
||||||
|
#undef assert
|
||||||
|
#define assert(_Expression) ((void)(_Expression))
|
||||||
|
#endif
|
||||||
|
|
||||||
#define ZAP_MAX_CHANNELS_SPAN 513
|
#define ZAP_MAX_CHANNELS_SPAN 513
|
||||||
#define ZAP_MAX_SPANS_INTERFACE 33
|
#define ZAP_MAX_SPANS_INTERFACE 33
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue