fix windows export for data objects

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@745 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Michael Jerris 2009-06-09 21:17:30 +00:00
parent 112fd16be9
commit a9a154dc8b
6 changed files with 5 additions and 11 deletions

View File

@ -66,6 +66,7 @@
#define OZ_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl #define OZ_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl
#define OZ_DECLARE_DATA __declspec(dllimport) #define OZ_DECLARE_DATA __declspec(dllimport)
#endif #endif
#define EX_DECLARE_DATA __declspec(dllexport)
#else #else
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) #if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY)
#define OZ_DECLARE(type) __attribute__((visibility("default"))) type #define OZ_DECLARE(type) __attribute__((visibility("default"))) type
@ -76,6 +77,7 @@
#define OZ_DECLARE_NONSTD(type) type #define OZ_DECLARE_NONSTD(type) type
#define OZ_DECLARE_DATA #define OZ_DECLARE_DATA
#endif #endif
#define EX_DECLARE_DATA
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER

View File

@ -977,7 +977,7 @@ static ZIO_SIG_LOAD_FUNCTION(zap_analog_init)
/** /**
* \brief Openzap analog signaling module definition * \brief Openzap analog signaling module definition
*/ */
zap_module_t zap_module = { EX_DECLARE_DATA zap_module_t zap_module = {
"analog", "analog",
NULL, NULL,
NULL, NULL,

View File

@ -686,7 +686,7 @@ static ZIO_SIG_LOAD_FUNCTION(zap_analog_em_init)
/** /**
* \brief Openzap analog EM module definition * \brief Openzap analog EM module definition
*/ */
zap_module_t zap_module = { EX_DECLARE_DATA zap_module_t zap_module = {
"analog_em", "analog_em",
NULL, NULL,
NULL, NULL,

View File

@ -2347,7 +2347,7 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
/** /**
* \brief Openzap ISDN signaling module definition * \brief Openzap ISDN signaling module definition
*/ */
zap_module_t zap_module = { EX_DECLARE_DATA zap_module_t zap_module = {
"isdn", "isdn",
NULL, NULL,
close_pcap, close_pcap,

View File

@ -35,11 +35,6 @@
#include "openzap.h" #include "openzap.h"
#include "zap_pika.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 MAX_NUMBER_OF_TRUNKS 64
#define PIKA_BLOCK_SIZE 160 #define PIKA_BLOCK_SIZE 160

View File

@ -60,9 +60,6 @@
#define sangoma_sendmsg_socket sangoma_writemsg #define sangoma_sendmsg_socket sangoma_writemsg
#define sangoma_writemsg_tdm sangoma_writemsg #define sangoma_writemsg_tdm sangoma_writemsg
#define sangoma_create_socket_intr sangoma_open_api_span_chan #define sangoma_create_socket_intr sangoma_open_api_span_chan
#define EX_DECLARE_DATA __declspec(dllexport)
#else
#define EX_DECLARE_DATA
#endif #endif
/** /**