FSBUILD-278

diff --git a/src/mod/applications/mod_fax/mod_fax.c b/src/mod/applications/mod_fax/mod_fax.c
index 9c0eb7d904a33ba6d4538fb767e3711fff85ba09..4fb9edfba438220e3d339998b6bda6c7467de9c0 100644 (file)
--- a/src/mod/applications/mod_fax/mod_fax.c
+++ b/src/mod/applications/mod_fax/mod_fax.c
@@ -35,7 +35,7 @@
 #include <switch.h>
 #ifdef WIN32
 #define FAX_INVALID_SOCKET INVALID_HANDLE_VALUE
-typedef HANDLE fax_socket_t;
+typedef HANDLE zap_socket_t;
 #else
 #define FAX_INVALID_SOCKET -1
 typedef int zap_socket_t;

diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index fe1c594c5fac45d74375190542be3e354ec9d169..dab28c7afb752f37bba18f5f1634456421762c9b 100644 (file)
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -1142,9 +1142,10 @@ SWITCH_DECLARE(int) globalSetVariable(const char *var, const char *val, const ch
        if (zstr(val2)) val2 = NULL;
        
        if (val2) {
-               switch_core_set_var_conditional(var, val, val2);
+               return switch_core_set_var_conditional(var, val, val2);
        } else {
                switch_core_set_variable(var, val);
+               return SWITCH_STATUS_SUCCESS;
        }
 }