clean up windows build

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@11 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/openzap.vcproj b/libs/freetdm/openzap.vcproj
index 001ce133525fd37deeb6bbf7d82525c559ea6752..6cb321a69850127ef5f97ea923cf7671a8ff9c81 100644 (file)
--- a/libs/freetdm/openzap.vcproj
+++ b/libs/freetdm/openzap.vcproj
@@ -45,10 +45,14 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
+                               DisableLanguageExtensions="true"\r
+                               RuntimeTypeInfo="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
+                               WarnAsError="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -106,10 +110,14 @@
                                AdditionalIncludeDirectories="src/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
+                               DisableLanguageExtensions="true"\r
+                               RuntimeTypeInfo="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
+                               WarnAsError="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -171,6 +179,22 @@
                        <File\r
                                RelativePath=".\src\zap_wanpipe.c"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\src\zap_zt.c"\r

diff --git a/libs/freetdm/src/include/openzap.h b/libs/freetdm/src/include/openzap.h
index 725196225d6d53f13677d7c985aadd60e51f19db..3424a4ca479e8a0e5fbfe442440c23c8d70d4beb 100644 (file)
--- a/libs/freetdm/src/include/openzap.h
+++ b/libs/freetdm/src/include/openzap.h
@@ -37,7 +37,7 @@
 #define _XOPEN_SOURCE 500
 
 #ifdef _MSC_VER
-#if (_MSC_VER >= 1400)                 // VC8+
+#if (_MSC_VER >= 1400)                 /* VC8+ */
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
@@ -63,6 +63,11 @@
 #include "hashtable.h"
 #include "zap_config.h"
 
+#ifdef  NDEBUG
+#undef assert
+#define assert(_Expression)     ((void)(_Expression))
+#endif
+
 #define ZAP_MAX_CHANNELS_SPAN 513
 #define ZAP_MAX_SPANS_INTERFACE 33