fix windows calling conventions for modules with sub-modules broken in svn r12919

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12960 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index 62942c72c1c739e324d0be90b13ea5e7b3be66af..84d61febfe799143356da5e70763af8758665052 100644 (file)
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -145,13 +145,16 @@ typedef int gid_t;
 #define SWITCH_DECLARE_DATA                            __declspec(dllimport)
 #endif
 #if defined(SWITCH_MOD_DECLARE_STATIC)
-#define SWITCH_MOD_DECLARE(type)               type __cdecl
+#define SWITCH_MOD_DECLARE(type)               type __stdcall
+#define SWITCH_MOD_DECLARE_NONSTD(type)        type __cdecl
 #define SWITCH_MOD_DECLARE_DATA
 #elif defined(MOD_EXPORTS)
 #define SWITCH_MOD_DECLARE(type)               __declspec(dllexport) type __stdcall
+#define SWITCH_MOD_DECLARE_NONSTD(type)        __declspec(dllexport) type __cdecl
 #define SWITCH_MOD_DECLARE_DATA                        __declspec(dllexport)
 #else
 #define SWITCH_MOD_DECLARE(type)               __declspec(dllimport) type __stdcall
+#define SWITCH_MOD_DECLARE_NONSTD(type)        __declspec(dllimport) type __cdecl
 #define SWITCH_MOD_DECLARE_DATA                        __declspec(dllimport)
 #endif
 #define SIGHUP SIGTERM
@@ -170,6 +173,7 @@ typedef int gid_t;
 #define SWITCH_DECLARE_NONSTD(type)    __attribute__((visibility("default"))) type
 #define SWITCH_DECLARE_DATA            __attribute__((visibility("default")))
 #define SWITCH_MOD_DECLARE(type)       __attribute__((visibility("default"))) type
+#define SWITCH_MOD_DECLARE_NONSTD(type)        __attribute__((visibility("default"))) type
 #define SWITCH_MOD_DECLARE_DATA                __attribute__((visibility("default")))
 #define SWITCH_DECLARE_CLASS           __attribute__((visibility("default")))
 #else
@@ -177,6 +181,7 @@ typedef int gid_t;
 #define SWITCH_DECLARE_NONSTD(type)    type
 #define SWITCH_DECLARE_DATA
 #define SWITCH_MOD_DECLARE(type)       type
+#define SWITCH_MOD_DECLARE_NONSTD(type)        type
 #define SWITCH_MOD_DECLARE_DATA
 #define SWITCH_DECLARE_CLASS
 #endif

diff --git a/src/mod/languages/mod_managed/mod_managed.cpp b/src/mod/languages/mod_managed/mod_managed.cpp
index c14c521d0759152d646ecc2f621c4d8d5cc5f56e..94473ff724bd2901afae85238cee33c136ddfd33 100644 (file)
--- a/src/mod/languages/mod_managed/mod_managed.cpp
+++ b/src/mod/languages/mod_managed/mod_managed.cpp
@@ -77,7 +77,7 @@ static executeFunction executeDelegate;
 static executeBackgroundFunction executeBackgroundDelegate;\r
 static loadAssemblyFunction loadAssemblyDelegate;\r
 \r
-SWITCH_MOD_DECLARE(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, loadAssemblyFunction loadAssembly) \r
+SWITCH_MOD_DECLARE_NONSTD(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, loadAssemblyFunction loadAssembly) \r
 {\r
        runDelegate = run;\r
        executeDelegate = execute;\r
@@ -88,7 +88,7 @@ SWITCH_MOD_DECLARE(void) InitManagedDelegates(runFunction run, executeFunction e
 // Sets up delegates (and anything else needed) on the ManagedSession object\r
 // Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC\r
 // Exported method.\r
-SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) \r
+SWITCH_MOD_DECLARE_NONSTD(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) \r
 {\r
        switch_assert(session);\r
        if (!session) {\r

diff --git a/src/mod/languages/mod_managed/switch_platform.i b/src/mod/languages/mod_managed/switch_platform.i
index 262acc6c447229c49c05233affaa5cf02c102d2c..1e65abd41a2c835d8e90548bf2ae0be83a638782 100644 (file)
--- a/src/mod/languages/mod_managed/switch_platform.i
+++ b/src/mod/languages/mod_managed/switch_platform.i
@@ -31,6 +31,7 @@ typedef unsigned long in_addr_t;
 #define SWITCH_DECLARE(type) type\r
 #define SWITCH_DECLARE_NONSTD(type) type\r
 #define SWITCH_MOD_DECLARE(type) type\r
+#define SWITCH_MOD_DECLARE_NONSTD(type) type\r
 #define SWITCH_DECLARE_DATA\r
 #define SWITCH_MOD_DECLARE_DATA\r
 #define SWITCH_THREAD_FUNC\r

diff --git a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c b/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
index 5a79925ade255aee38db04743ad8043ebba44c7f..5dbea1c106ab33d3ad380f00c4f162d17331f24d 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
+++ b/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c
@@ -332,7 +332,7 @@ const sm_module_interface_t DB_module_interface = {
        /*.next */ NULL
 };
 
-SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
+SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
 {
        *module_interface = &DB_module_interface;
        return SWITCH_STATUS_SUCCESS;

diff --git a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c b/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
index c368ba0dfce216ef1594c29cf6b867c026498b69..1cb8cbc8284adc6220199d8fa8e9819b2dfebb94 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
+++ b/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c
@@ -240,7 +240,7 @@ const sm_module_interface_t curl_module_interface = {
        /*.next */ NULL
 };
 
-SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
+SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
 {
        curl_global_init(CURL_GLOBAL_ALL);
        *module_interface = &curl_module_interface;

diff --git a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c b/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
index 1fb986609892a7fc63da36d5a8c967c737b098b5..77101828844261ec21424ad317474a2ccc43a5e5 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
+++ b/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c
@@ -533,7 +533,7 @@ const sm_module_interface_t odbc_module_interface = {
        /*.next */ NULL
 };
 
-SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
+SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
 {
        *module_interface = &odbc_module_interface;
        return SWITCH_STATUS_SUCCESS;

diff --git a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c b/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
index be3a7d0ea25880691b82cfe5e54b5b7ff34f9abc..75a8c58ca095552e50cd4ae9018f0418713e826c 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
+++ b/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c
@@ -324,7 +324,7 @@ const sm_module_interface_t socket_module_interface = {
        /*.next */ NULL
 };
 
-SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
+SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
 {
        *module_interface = &socket_module_interface;
        return SWITCH_STATUS_SUCCESS;

diff --git a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c b/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
index 7c29f92566f5743e566ae6ade306c9b1742161b5..9fed5ddf2361f5d648dec4195e8e9d631ab260ca 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
+++ b/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c
@@ -346,7 +346,7 @@ const sm_module_interface_t teletone_module_interface = {
        /*.next */ NULL
 };
 
-SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
+SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t **module_interface)
 {
        *module_interface = &teletone_module_interface;
        return SWITCH_STATUS_SUCCESS;