more windows build tweaks

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

diff --git a/libs/openzap/openzap.vcproj b/libs/openzap/openzap.vcproj
index 6cb321a69850127ef5f97ea923cf7671a8ff9c81..f6ca7e8c6d4855ec031e51dd27e99a7879721491 100644 (file)
--- a/libs/openzap/openzap.vcproj
+++ b/libs/openzap/openzap.vcproj
@@ -45,7 +45,7 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
-                               DisableLanguageExtensions="true"\r
+                               DisableLanguageExtensions="false"\r
                                RuntimeTypeInfo="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
@@ -110,7 +110,7 @@
                                AdditionalIncludeDirectories="src/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
-                               DisableLanguageExtensions="true"\r
+                               DisableLanguageExtensions="false"\r
                                RuntimeTypeInfo="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
@@ -185,6 +185,7 @@
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="C:\src\wanpipe-3.1.0.p21\patches\kdrivers\include"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -193,6 +194,7 @@
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="C:\src\wanpipe-3.1.0.p21\patches\kdrivers\include"\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r

diff --git a/libs/openzap/src/zap_wanpipe.c b/libs/openzap/src/zap_wanpipe.c
index cea8594baca983f7da8e7ca17ce92ee9289c81b2..945382c41269fe0e0b480c6b0f805a22e142a3b4 100644 (file)
--- a/libs/openzap/src/zap_wanpipe.c
+++ b/libs/openzap/src/zap_wanpipe.c
@@ -31,11 +31,38 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define WANPIPE_TDM_API 1
+
+#ifndef __WINDOWS__
+#if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)
+#define __WINDOWS__
+#endif
+#endif
+
 #include "openzap.h"
 #include "zap_wanpipe.h"
+
+#ifdef __WINDOWS__
+#ifdef _MSC_VER
+/* disable warning for zero length array in a struct */
+/* this will cause errors on c99 and ansi compliant compilers and will need to be fixed in the wanpipe header files */
+#pragma warning(disable:4200)
+#endif
+#include <windows.h>
+#include <winioctl.h>
+#include <conio.h>
+#include <stddef.h>
+typedef unsigned __int16 u_int16_t;
+typedef unsigned __int32 u_int32_t;
+#endif
+
 #include <wanpipe_defines.h>
 #include <wanpipe_cfg.h>
 #include <wanpipe_tdm_api.h>
+#ifdef __WINDOWS__
+#include <sang_status_defines.h>
+#include <sang_api.h>
+#endif
 #include <sdla_te1_pmc.h>
 #include <sdla_te1.h>
 #include <sdla_56k.h>