fix windows build breakage from svn rev 11084

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

diff --git a/src/include/switch_dso.h b/src/include/switch_dso.h
index 28908e53323872f690fb017a350236449d218d1e..83498ff87b7ab366249a113f9106c108c31616e6 100644 (file)
--- a/src/include/switch_dso.h
+++ b/src/include/switch_dso.h
@@ -30,10 +30,10 @@ typedef void * switch_dso_lib_t;
 
 typedef void * switch_dso_data_t;
 
-void switch_dso_destroy(switch_dso_lib_t *lib);
-switch_dso_lib_t switch_dso_open(const char *path, int global, char **err);
-switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err);
-void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err);
+SWITCH_DECLARE(void) switch_dso_destroy(switch_dso_lib_t *lib);
+SWITCH_DECLARE(switch_dso_lib_t) switch_dso_open(const char *path, int global, char **err);
+SWITCH_DECLARE(switch_dso_func_t) switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err);
+SWITCH_DECLARE(void *) switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err);
 
 
 #endif

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index 90e164e14b3cecdbc7a2141b9b483c9789d43f04..9912ead2e2abe261991838d0425cfc2416f9363b 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -927,8 +927,8 @@ static switch_status_t sm_load_file(char *filename)
 
  err:
 
-       if (err) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, err);
+       if (err || !module) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, switch_str_nil(err));
                switch_safe_free(derr);
                return SWITCH_STATUS_GENERR;
        }

diff --git a/src/switch_dso.c b/src/switch_dso.c
index 2dc2910dbc70b466058c6ea3bee6e46f4e9b71b4..8d5b9654195b7e7ceac64cd255bade9b56a74ae7 100644 (file)
--- a/src/switch_dso.c
+++ b/src/switch_dso.c
@@ -24,14 +24,14 @@
 \r
 #ifdef WIN32\r
 \r
-void switch_dso_destroy(switch_dso_lib_t *lib) {\r
+SWITCH_DECLARE(void) switch_dso_destroy(switch_dso_lib_t *lib) {\r
        if (lib && *lib) {\r
                FreeLibrary(*lib);\r
                *lib = NULL;\r
        }\r
 }\r
 \r
-switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) {\r
+SWITCH_DECLARE(switch_dso_lib_t) switch_dso_open(const char *path, int global, char **err) {\r
     HINSTANCE lib;\r
        \r
        lib = LoadLibraryEx(path, NULL, 0);\r
@@ -48,7 +48,7 @@ switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) {
        return lib;\r
 }\r
 \r
-switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) {\r
+SWITCH_DECLARE(switch_dso_func_t) switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) {\r
        FARPROC func = GetProcAddress(lib, sym);\r
        if (!func) {\r
                DWORD error = GetLastError();\r
@@ -57,7 +57,7 @@ switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, cha
        return (switch_dso_func_t)func;\r
 }\r
 \r
-void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) {\r
+SWITCH_DECLARE(void *) switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) {\r
        FARPROC addr = GetProcAddress(lib, sym);\r
        if (!addr) {\r
                DWORD error = GetLastError();\r