fix windows export for data objects

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

diff --git a/libs/freetdm/src/include/openzap.h b/libs/freetdm/src/include/openzap.h
index 937a69f502a24ba56c8cb61a3eb4d7abbca0886e..4c14ef845d995b52db29f41e6f4397c8ca841d0e 100644 (file)
--- a/libs/freetdm/src/include/openzap.h
+++ b/libs/freetdm/src/include/openzap.h
@@ -66,6 +66,7 @@
 #define OZ_DECLARE_NONSTD(type)                __declspec(dllimport) type __cdecl
 #define OZ_DECLARE_DATA                                __declspec(dllimport)
 #endif
+#define EX_DECLARE_DATA                                __declspec(dllexport)
 #else
 #if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY)
 #define OZ_DECLARE(type)               __attribute__((visibility("default"))) type
@@ -76,6 +77,7 @@
 #define OZ_DECLARE_NONSTD(type)        type
 #define OZ_DECLARE_DATA
 #endif
+#define EX_DECLARE_DATA
 #endif
 
 #ifdef _MSC_VER

diff --git a/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c b/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c
index 9dcd8d64fdc7449c6058333446088d92e835ea06..20de17dbd10852b525aba97c331a625563324ea3 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c
+++ b/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c
@@ -977,7 +977,7 @@ static ZIO_SIG_LOAD_FUNCTION(zap_analog_init)
 /**
  * \brief Openzap analog signaling module definition
  */
-zap_module_t zap_module = { 
+EX_DECLARE_DATA zap_module_t zap_module = {
        "analog",
        NULL,
        NULL,

diff --git a/libs/freetdm/src/ozmod/ozmod_analog_em/ozmod_analog_em.c b/libs/freetdm/src/ozmod/ozmod_analog_em/ozmod_analog_em.c
index 72da38150093c445886ad9008c4eded6ececea16..3a8e9a2156fe72c80ce747092af896bed135c835 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_analog_em/ozmod_analog_em.c
+++ b/libs/freetdm/src/ozmod/ozmod_analog_em/ozmod_analog_em.c
@@ -686,7 +686,7 @@ static ZIO_SIG_LOAD_FUNCTION(zap_analog_em_init)
 /**
  * \brief Openzap analog EM module definition
  */
-zap_module_t zap_module = { 
+EX_DECLARE_DATA zap_module_t zap_module = {
        "analog_em",
        NULL,
        NULL,

diff --git a/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c b/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
index 213def357e8f785a1402582bac6504ab741d719f..192a4446a24d5145eb89365bcf49deeaa4627f0c 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
+++ b/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
@@ -2347,7 +2347,7 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
 /**
  * \brief Openzap ISDN signaling module definition
  */
-zap_module_t zap_module = { 
+EX_DECLARE_DATA zap_module_t zap_module = {
        "isdn",
        NULL,
        close_pcap,

diff --git a/libs/freetdm/src/ozmod/ozmod_pika/ozmod_pika.c b/libs/freetdm/src/ozmod/ozmod_pika/ozmod_pika.c
index 26f72d7f7c1c487de2983dfb94f94505b67e431b..995c6df554bbfe19fa75c95d380c9b1e93146980 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_pika/ozmod_pika.c
+++ b/libs/freetdm/src/ozmod/ozmod_pika/ozmod_pika.c
@@ -35,11 +35,6 @@
 #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

diff --git a/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c b/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
index 038f1c8b379953bd89476a2af27ea9b62d5c3430..9dcd6e5ae2c78382fd7793853d96e9f555658f90 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
+++ b/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
@@ -60,9 +60,6 @@
 #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
-#define EX_DECLARE_DATA
 #endif
 
 /**