add wanpipe and pika to windows build (OPENZAP-65)

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

diff --git a/libs/openzap/msvc/testanalog/testanalog.2005.vcproj b/libs/openzap/msvc/testanalog/testanalog.2005.vcproj
index 7f762fe4ad7d0b152863b513ca79c79023db7c12..93553d2a5f364f2ae6158353454d0c448f767add 100644 (file)
--- a/libs/openzap/msvc/testanalog/testanalog.2005.vcproj
+++ b/libs/openzap/msvc/testanalog/testanalog.2005.vcproj
@@ -51,6 +51,7 @@
                                WarnAsError="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -127,6 +128,7 @@
                                WarnAsError="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/msvc/testanalog/testanalog.2008.vcproj b/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
index e3293649f5d60a813f9ea8b0f44b62af34901ccf..7a80eeea943a70e3647b8cb4711d50adac4ceee9 100644 (file)
--- a/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
+++ b/libs/openzap/msvc/testanalog/testanalog.2008.vcproj
@@ -51,6 +51,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -125,6 +126,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/msvc/testisdn/testisdn.2005.vcproj b/libs/openzap/msvc/testisdn/testisdn.2005.vcproj
index cce13b765304f73799b170e3b506da2ff4f063ba..133557166b02473915a22697d5ca791d64856b1d 100644 (file)
--- a/libs/openzap/msvc/testisdn/testisdn.2005.vcproj
+++ b/libs/openzap/msvc/testisdn/testisdn.2005.vcproj
@@ -51,6 +51,7 @@
                                WarnAsError="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -127,6 +128,7 @@
                                WarnAsError="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/msvc/testisdn/testisdn.2008.vcproj b/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
index 3fac540c637615790ae1cde2facc954233c9dcc3..56d8e529837a352a0703235bc40d1eb8a955bdab 100644 (file)
--- a/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
+++ b/libs/openzap/msvc/testisdn/testisdn.2008.vcproj
@@ -51,6 +51,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -125,6 +126,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/openzap.2005.sln b/libs/openzap/openzap.2005.sln
index adba937d2f491d23e7b9eaa96400b9dcd9c8dd95..c9f666b381cb95daecdd3849979f557d0d6d3e42 100644 (file)
--- a/libs/openzap/openzap.2005.sln
+++ b/libs/openzap/openzap.2005.sln
@@ -33,6 +33,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_isdn", "src\ozmod\ozm
                {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_wanpipe", "src\ozmod\ozmod_wanpipe\ozmod_wanpipe.2005.vcproj", "{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_pika", "src\ozmod\ozmod_pika\ozmod_pika.2005.vcproj", "{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -67,6 +71,10 @@ Global
                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.Build.0 = Debug|Win32\r
                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32\r
                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.Build.0 = Release|Win32\r
+               {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/libs/openzap/openzap.2008.sln b/libs/openzap/openzap.2008.sln
index d0ed62d842a570a945a8cc710de07e38bd41268d..7bf028e616d057b08ac64b2817a85d2cbc6f812e 100644 (file)
--- a/libs/openzap/openzap.2008.sln
+++ b/libs/openzap/openzap.2008.sln
@@ -33,6 +33,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_isdn", "src\ozmod\ozm
                {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_pika", "src\ozmod\ozmod_pika\ozmod_pika.2008.vcproj", "{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_wanpipe", "src\ozmod\ozmod_wanpipe\ozmod_wanpipe.2008.vcproj", "{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -67,6 +74,10 @@ Global
                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.Build.0 = Debug|Win32\r
                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32\r
                {729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.Build.0 = Release|Win32\r
+               {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/libs/openzap/src/hashtable.c b/libs/openzap/src/hashtable.c
index e1deb8912f4b9deb5b0f669464c0ece5bb45324a..5dafc09233a3dff0b683ebcec6deed5c5c17b030 100644 (file)
--- a/libs/openzap/src/hashtable.c
+++ b/libs/openzap/src/hashtable.c
@@ -56,7 +56,7 @@ const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]);
 const float max_load_factor = 0.65f;
 
 /*****************************************************************************/
-struct hashtable *
+OZ_DECLARE(struct hashtable *)
 create_hashtable(unsigned int minsize,
                  unsigned int (*hashf) (void*),
                  int (*eqf) (void*,void*))
@@ -157,14 +157,14 @@ hashtable_expand(struct hashtable *h)
 }
 
 /*****************************************************************************/
-unsigned int
+OZ_DECLARE(unsigned int)
 hashtable_count(struct hashtable *h)
 {
     return h->entrycount;
 }
 
 /*****************************************************************************/
-int
+OZ_DECLARE(int)
 hashtable_insert(struct hashtable *h, void *k, void *v, hashtable_flag_t flags)
 {
     /* This method allows duplicate keys - but they shouldn't be used */
@@ -191,7 +191,7 @@ hashtable_insert(struct hashtable *h, void *k, void *v, hashtable_flag_t flags)
 }
 
 /*****************************************************************************/
-void * /* returns value associated with key */
+OZ_DECLARE(void *) /* returns value associated with key */
 hashtable_search(struct hashtable *h, void *k)
 {
     struct entry *e;
@@ -209,7 +209,7 @@ hashtable_search(struct hashtable *h, void *k)
 }
 
 /*****************************************************************************/
-void * /* returns value associated with key */
+OZ_DECLARE(void *) /* returns value associated with key */
 hashtable_remove(struct hashtable *h, void *k)
 {
     /* TODO: consider compacting the table when the load factor drops enough,
@@ -246,7 +246,7 @@ hashtable_remove(struct hashtable *h, void *k)
 
 /*****************************************************************************/
 /* destroy */
-void
+OZ_DECLARE(void)
 hashtable_destroy(struct hashtable *h)
 {
     unsigned int i;
@@ -264,7 +264,7 @@ hashtable_destroy(struct hashtable *h)
     free(h);
 }
 
-struct hashtable_iterator *hashtable_next(struct hashtable_iterator *i)
+OZ_DECLARE(struct hashtable_iterator *) hashtable_next(struct hashtable_iterator *i)
 {
 
        if (i->e) {
@@ -290,7 +290,7 @@ struct hashtable_iterator *hashtable_next(struct hashtable_iterator *i)
        return NULL;
 }
 
-struct hashtable_iterator *hashtable_first(struct hashtable *h)
+OZ_DECLARE(struct hashtable_iterator *) hashtable_first(struct hashtable *h)
 {
        h->iterator.pos = 0;
        h->iterator.e = NULL;
@@ -300,7 +300,7 @@ struct hashtable_iterator *hashtable_first(struct hashtable *h)
 
 
 
-void hashtable_this(struct hashtable_iterator *i, const void **key, int *klen, void **val)
+OZ_DECLARE(void) hashtable_this(struct hashtable_iterator *i, const void **key, int *klen, void **val)
 {
        if (i->e) {
                if (key) {

diff --git a/libs/openzap/src/include/hashtable.h b/libs/openzap/src/include/hashtable.h
index 137e9460e6255bd7f1ff03019441cf353be92c06..ea63e2e91d020a419d975aeecf181909cc001070 100644 (file)
--- a/libs/openzap/src/include/hashtable.h
+++ b/libs/openzap/src/include/hashtable.h
@@ -7,6 +7,7 @@
 #define __inline__ __inline
 #endif
 #endif
+#include "openzap.h"
 
 struct hashtable;
 struct hashtable_iterator;
@@ -77,7 +78,7 @@ struct hashtable_iterator;
  * @return                  newly created hashtable or NULL on failure
  */
 
-struct hashtable *
+OZ_DECLARE(struct hashtable *)
 create_hashtable(unsigned int minsize,
                  unsigned int (*hashfunction) (void*),
                  int (*key_eq_fn) (void*,void*));
@@ -108,7 +109,7 @@ typedef enum {
        HASHTABLE_FLAG_FREE_VALUE = (1 << 1)
 } hashtable_flag_t;
 
-int 
+OZ_DECLARE(int)
 hashtable_insert(struct hashtable *h, void *k, void *v, hashtable_flag_t flags);
 
 #define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype)            \
@@ -126,7 +127,7 @@ hashtable_insert(struct hashtable *h, void *k, void *v, hashtable_flag_t flags);
  * @return      the value associated with the key, or NULL if none found
  */
 
-void *
+OZ_DECLARE(void *)
 hashtable_search(struct hashtable *h, void *k);
 
 #define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \
@@ -144,7 +145,7 @@ hashtable_search(struct hashtable *h, void *k);
  * @return      the value associated with the key, or NULL if none found
  */
 
-void * /* returns value */
+OZ_DECLARE(void *) /* returns value */
 hashtable_remove(struct hashtable *h, void *k);
 
 #define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \
@@ -161,7 +162,7 @@ hashtable_remove(struct hashtable *h, void *k);
  * @param   h   the hashtable
  * @return      the number of items stored in the hashtable
  */
-unsigned int
+OZ_DECLARE(unsigned int)
 hashtable_count(struct hashtable *h);
 
 
@@ -173,12 +174,12 @@ hashtable_count(struct hashtable *h);
  * @param       free_values     whether to call 'free' on the remaining values
  */
 
-void
+OZ_DECLARE(void)
 hashtable_destroy(struct hashtable *h);
 
-struct hashtable_iterator *hashtable_first(struct hashtable *h);
-struct hashtable_iterator *hashtable_next(struct hashtable_iterator *i);
-void hashtable_this(struct hashtable_iterator *i, const void **key, int *klen, void **val);
+OZ_DECLARE(struct hashtable_iterator*) hashtable_first(struct hashtable *h);
+OZ_DECLARE(struct hashtable_iterator*) hashtable_next(struct hashtable_iterator *i);
+OZ_DECLARE(void) hashtable_this(struct hashtable_iterator *i, const void **key, int *klen, void **val);
 
 #endif /* __HASHTABLE_CWC22_H__ */
 

diff --git a/libs/openzap/src/include/zap_config.h b/libs/openzap/src/include/zap_config.h
index f5500293888de749f46746f7d360a4568e340154..967c09cd7987cfabd4a569c28d529baac7e2aafa 100644 (file)
--- a/libs/openzap/src/include/zap_config.h
+++ b/libs/openzap/src/include/zap_config.h
@@ -121,7 +121,7 @@ int zap_config_next_pair(zap_config_t * cfg, char **var, char **val);
   \param strvalue pointer to the configuration string value (expected to be in format whatever:xxxx)
   \param outbits pointer to aim at the CAS bits
 */
-int zap_config_get_cas_bits(char *strvalue, unsigned char *outbits);
+OZ_DECLARE (int) zap_config_get_cas_bits(char *strvalue, unsigned char *outbits);
 
 
 /** @} */

diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
index f0d697c6196fc8f7dc281430d8b5127e124b3621..964393805c1c77e5e282005c01a31c5274adb7f2 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2005.vcproj
@@ -49,6 +49,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -126,6 +127,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
index 2a07fd9dc6856fa1dc9c279b54efc5029cc03386..a8211ca10dc29245cd0c4103345d979bdd0ad269 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.2008.vcproj
@@ -50,6 +50,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -124,6 +125,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
index 3cc853b688bbd3ac1d51cd1038fd1fb755348b96..bff0716d4c0ff95c89515acfcf93347f2b449973 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2005.vcproj
@@ -49,6 +49,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -126,6 +127,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
index 9156c463d25f30777c8815df225b472a3f259c47..70f057ab37f404f0abc8e2520178145ae01e3913 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
+++ b/libs/openzap/src/ozmod/ozmod_analog_em/ozmod_analog_em.2008.vcproj
@@ -50,6 +50,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -124,6 +125,7 @@
                                WarningLevel="4"\r
                                WarnAsError="true"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4100"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.2005.vcproj b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.2005.vcproj
new file mode 100644 (file)
index 0000000..c62eddd
--- /dev/null
+++ b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.2005.vcproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="ozmod_pika"\r
+       ProjectGUID="{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"\r
+       RootNamespace="ozmod_pika"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pikahmpapi.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pikahmpapi.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\ozmod_pika.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\zap_pika.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.2008.vcproj b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.2008.vcproj
new file mode 100644 (file)
index 0000000..2e3cfce
--- /dev/null
+++ b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.2008.vcproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="ozmod_pika"\r
+       ProjectGUID="{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"\r
+       RootNamespace="ozmod_pika"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pikahmpapi.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="pikahmpapi.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\..\..\pika\aoh\lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\ozmod_pika.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\zap_pika.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c
index c409f9535e26f73be7b06b15eb59db3023aae04c..5de8ac3974b037613fba22f18cef177f09d95e59 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c
+++ b/libs/openzap/src/ozmod/ozmod_pika/ozmod_pika.c
@@ -35,6 +35,12 @@
 #include "openzap.h"
 #include "zap_pika.h"
 
+#if defined(__WINDOWS__)
+#define EX_DECLARE_DATA                                __declspec(dllexport)
+#else
+EX_DECLARE_DATA
+#endif
+
 #define MAX_NUMBER_OF_TRUNKS 64
 #define PIKA_BLOCK_SIZE 160
 #define PIKA_BLOCK_LEN 20
@@ -45,19 +51,19 @@
 PK_VOID PK_CALLBACK media_out_callback(PKH_TPikaEvent *event);
 
 ZAP_ENUM_NAMES(PIKA_SPAN_NAMES, PIKA_SPAN_STRINGS)
-ZAP_STR2ENUM(pika_str2span, pika_span2str, PIKA_TSpanFraming, PIKA_SPAN_NAMES, PIKA_SPAN_INVALID)
+PIKA_STR2ENUM(pika_str2span, pika_span2str, PIKA_TSpanFraming, PIKA_SPAN_NAMES, PIKA_SPAN_INVALID)
 
 ZAP_ENUM_NAMES(PIKA_SPAN_ENCODING_NAMES, PIKA_SPAN_ENCODING_STRINGS)
-ZAP_STR2ENUM(pika_str2span_encoding, pika_span_encoding2str, PIKA_TSpanEncoding, PIKA_SPAN_ENCODING_NAMES, PIKA_SPAN_ENCODING_INVALID)
+PIKA_STR2ENUM(pika_str2span_encoding, pika_span_encoding2str, PIKA_TSpanEncoding, PIKA_SPAN_ENCODING_NAMES, PIKA_SPAN_ENCODING_INVALID)
 
 ZAP_ENUM_NAMES(PIKA_LL_NAMES, PIKA_LL_STRINGS)
-ZAP_STR2ENUM(pika_str2loop_length, pika_loop_length2str, PIKA_TSpanLoopLength, PIKA_LL_NAMES, PIKA_SPAN_LOOP_INVALID)
+PIKA_STR2ENUM(pika_str2loop_length, pika_loop_length2str, PIKA_TSpanLoopLength, PIKA_LL_NAMES, PIKA_SPAN_LOOP_INVALID)
 
 ZAP_ENUM_NAMES(PIKA_LBO_NAMES, PIKA_LBO_STRINGS)
-ZAP_STR2ENUM(pika_str2lbo, pika_lbo2str, PIKA_TSpanBuildOut, PIKA_LBO_NAMES, PIKA_SPAN_LBO_INVALID)
+PIKA_STR2ENUM(pika_str2lbo, pika_lbo2str, PIKA_TSpanBuildOut, PIKA_LBO_NAMES, PIKA_SPAN_LBO_INVALID)
 
 ZAP_ENUM_NAMES(PIKA_SPAN_COMPAND_MODE_NAMES, PIKA_SPAN_COMPAND_MODE_STRINGS)
-ZAP_STR2ENUM(pika_str2compand_mode, pika_compand_mode2str, PIKA_TSpanCompandMode, PIKA_SPAN_COMPAND_MODE_NAMES, PIKA_SPAN_COMPAND_MODE_INVALID)
+PIKA_STR2ENUM(pika_str2compand_mode, pika_compand_mode2str, PIKA_TSpanCompandMode, PIKA_SPAN_COMPAND_MODE_NAMES, PIKA_SPAN_COMPAND_MODE_INVALID)
 
 
 typedef enum {
@@ -153,7 +159,7 @@ static ZIO_CONFIGURE_FUNCTION(pika_configure)
                profile->ec_config = globals.ec_config;
                profile->record_config = globals.record_config;
                profile->play_config = globals.play_config;
-               hashtable_insert(globals.profile_hash, (void *)profile->name, profile);
+               hashtable_insert(globals.profile_hash, (void *)profile->name, profile, HASHTABLE_FLAG_NONE);
                zap_log(ZAP_LOG_INFO, "creating profile [%s]\n", category);
        }
 
@@ -1335,12 +1341,12 @@ static ZIO_IO_UNLOAD_FUNCTION(pika_destroy)
                zap_log(ZAP_LOG_INFO, "Closing system handle\n");
        }
 
-       hashtable_destroy(globals.profile_hash, 0, 1);
+       hashtable_destroy(globals.profile_hash);
 
        return ZAP_SUCCESS;
 }
 
-zap_module_t zap_module = { 
+EX_DECLARE_DATA zap_module_t zap_module = { 
        "pika",
        pika_init,
        pika_destroy,

diff --git a/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h b/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h
index c8401c6aa1af67164b84cea2224bea39bb7f5b9a..da1864d48672095feab05e54fa39c1144409a619 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h
+++ b/libs/openzap/src/ozmod/ozmod_pika/zap_pika.h
@@ -38,6 +38,30 @@
 
 
 
+#define PIKA_STR2ENUM_P(_FUNC1, _FUNC2, _TYPE) _TYPE _FUNC1 (const char *name); const char * _FUNC2 (_TYPE type);
+#define PIKA_STR2ENUM(_FUNC1, _FUNC2, _TYPE, _STRINGS, _MAX)   \
+       _TYPE _FUNC1 (const char *name)                                                         \
+       {                                                                                                               \
+               int i;                                                                                          \
+               _TYPE t = _MAX ;                                                                        \
+                                                                                                                       \
+               for (i = 0; i < _MAX ; i++) {                                           \
+                       if (!strcasecmp(name, _STRINGS[i])) {                   \
+                               t = (_TYPE) i;                                                          \
+                               break;                                                                          \
+                       }                                                                                               \
+               }                                                                                                       \
+                                                                                                                       \
+               return t;                                                                                       \
+       }                                                                                                               \
+       const char * _FUNC2 (_TYPE type)                                                \
+       {                                                                                                               \
+               if (type > _MAX) {                                                                      \
+                       type = _MAX;                                                                    \
+               }                                                                                                       \
+               return _STRINGS[(int)type];                                                     \
+       }
+
 
 typedef enum {
        PIKA_SPAN_FRAMING_T1_D4,
@@ -47,7 +71,7 @@ typedef enum {
        PIKA_SPAN_INVALID
 } PIKA_TSpanFraming;
 #define PIKA_SPAN_STRINGS "T1_D4", "T1_ESF", "E1_BASIC", "E1_CRC4"
-ZAP_STR2ENUM_P(pika_str2span, pika_span2str, PIKA_TSpanFraming)
+PIKA_STR2ENUM_P(pika_str2span, pika_span2str, PIKA_TSpanFraming)
 
 typedef enum {
        PIKA_SPAN_ENCODING_T1_AMI_ZS_NONE,
@@ -60,7 +84,7 @@ typedef enum {
        PIKA_SPAN_ENCODING_INVALID
 } PIKA_TSpanEncoding;
 #define PIKA_SPAN_ENCODING_STRINGS "T1_AMI_ZS_NONE", "T1_AMI_ZS_GTE", "T1_AMI_ZS_BELL", "T1_AMI_ZS_JAM8", "T1_B8ZS", "E1_AMI", "E1_HDB3"
-ZAP_STR2ENUM_P(pika_str2span_encoding, pika_span_encoding2str, PIKA_TSpanEncoding)
+PIKA_STR2ENUM_P(pika_str2span_encoding, pika_span_encoding2str, PIKA_TSpanEncoding)
 
 typedef enum {
        PIKA_SPAN_LOOP_LENGTH_SHORT_HAUL,
@@ -68,7 +92,7 @@ typedef enum {
        PIKA_SPAN_LOOP_INVALID
 } PIKA_TSpanLoopLength;
 #define PIKA_LL_STRINGS "SHORT_HAUL", "LONG_HAUL"
-ZAP_STR2ENUM_P(pika_str2loop_length, pika_loop_length2str, PIKA_TSpanLoopLength)
+PIKA_STR2ENUM_P(pika_str2loop_length, pika_loop_length2str, PIKA_TSpanLoopLength)
 
 typedef enum {
        PIKA_SPAN_LBO_T1_LONG_0_DB,
@@ -84,7 +108,7 @@ typedef enum {
        PIKA_SPAN_LBO_INVALID
 } PIKA_TSpanBuildOut;
 #define PIKA_LBO_STRINGS "T1_LONG_0_DB", "T1_LONG_7_DB", "T1_LONG_15_DB", "T1_LONG_22_DB", "T1_SHORT_133_FT", "T1_SHORT_266_FT", "T1_SHORT_399_FT", "T1_SHORT_533_FT", "T1_SHORT_655_FT", "E1_WAVEFORM_120_OHM"
-ZAP_STR2ENUM_P(pika_str2lbo, pika_lbo2str, PIKA_TSpanBuildOut)
+PIKA_STR2ENUM_P(pika_str2lbo, pika_lbo2str, PIKA_TSpanBuildOut)
 
 typedef enum {
        PIKA_SPAN_COMPAND_MODE_MU_LAW = 1,
@@ -92,7 +116,7 @@ typedef enum {
        PIKA_SPAN_COMPAND_MODE_INVALID
 } PIKA_TSpanCompandMode;
 #define PIKA_SPAN_COMPAND_MODE_STRINGS "MU_LAW", "A_LAW"
-ZAP_STR2ENUM_P(pika_str2compand_mode, pika_compand_mode2str, PIKA_TSpanCompandMode)
+PIKA_STR2ENUM_P(pika_str2compand_mode, pika_compand_mode2str, PIKA_TSpanCompandMode)
 
 #endif
 

diff --git a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2005.vcproj b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2005.vcproj
new file mode 100644 (file)
index 0000000..da21a76
--- /dev/null
+++ b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2005.vcproj
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="ozmod_wanpipe"\r
+       ProjectGUID="{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"\r
+       RootNamespace="ozmod_wanpipe"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="openzap.lib libsangoma.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="openzap.lib libsangoma.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\ozmod_wanpipe.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj
new file mode 100644 (file)
index 0000000..1c8685c
--- /dev/null
+++ b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="ozmod_wanpipe"\r
+       ProjectGUID="{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"\r
+       RootNamespace="ozmod_wanpipe"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="openzap.lib libsangoma.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="openzap.lib libsangoma.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\ozmod_wanpipe.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
index 7e72f214eab6961860f2d63fd73950e0d0abaed8..9974d7a786dbe0688d10373235fbabbf506bf96c 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
+++ b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
@@ -36,10 +36,35 @@
 #include <stropts.h>
 #endif
 #include "openzap.h"
+#ifndef __WINDOWS__
 #include <poll.h>
 #include <sys/socket.h>
+#endif
 #include "libsangoma.h"
 
+#if defined(__WINDOWS__)
+/*! Backward compatible defines - current code is all using the old names*/ 
+#define sangoma_open_tdmapi_span_chan sangoma_open_api_span_chan
+#define sangoma_open_tdmapi_span sangoma_open_api_span
+#define sangoma_open_tdmapi_ctrl sangoma_open_api_ctrl
+#define sangoma_tdm_get_fe_status sangoma_get_fe_status
+#define sangoma_socket_close sangoma_close
+#define sangoma_tdm_get_hw_coding sangoma_get_hw_coding
+#define sangoma_tdm_set_fe_status sangoma_set_fe_status
+#define sangoma_tdm_get_link_status sangoma_get_link_status
+#define sangoma_tdm_flush_bufs sangoma_flush_bufs
+#define sangoma_tdm_cmd_exec sangoma_cmd_exec
+#define sangoma_tdm_read_event sangoma_read_event
+#define sangoma_readmsg_tdm sangoma_readmsg
+#define sangoma_readmsg_socket sangoma_readmsg
+#define sangoma_sendmsg_socket sangoma_writemsg
+#define sangoma_writemsg_tdm sangoma_writemsg
+#define sangoma_create_socket_intr sangoma_open_api_span_chan
+#define EX_DECLARE_DATA                                __declspec(dllexport)
+#else
+WP_DECLARE_DATA
+#endif
+
 typedef enum {
        WP_RINGING = (1 << 0)
 } wp_flag_t;
@@ -849,7 +874,7 @@ static ZIO_IO_UNLOAD_FUNCTION(wanpipe_destroy)
 }
 
 
-zap_module_t zap_module = { 
+EX_DECLARE_DATA zap_module_t zap_module = { 
        "wanpipe",
        wanpipe_init,
        wanpipe_destroy,

diff --git a/libs/openzap/src/zap_config.c b/libs/openzap/src/zap_config.c
index ab622dd7d3ce153f1c3927f88ece2cf9164527e8..32567041eb482d459f49e74856c7f5069ca3bb71 100644 (file)
--- a/libs/openzap/src/zap_config.c
+++ b/libs/openzap/src/zap_config.c
@@ -209,7 +209,7 @@ int zap_config_next_pair(zap_config_t *cfg, char **var, char **val)
 
 }
 
-int zap_config_get_cas_bits(char *strvalue, unsigned char *outbits)
+OZ_DECLARE (int) zap_config_get_cas_bits(char *strvalue, unsigned char *outbits)
 {
        char cas_bits[5];
        unsigned char bit = 0x8;