From ea5e699cb231a8056c75c0a2ebf2fcbd7b323efa Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Wed, 26 May 2010 09:33:16 -0500
Subject: [PATCH] FSBUILD-278

---
 src/mod/applications/mod_fax/mod_fax.c | 2 +-
 src/switch_cpp.cpp                     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mod/applications/mod_fax/mod_fax.c b/src/mod/applications/mod_fax/mod_fax.c
index 9c0eb7d904..4fb9edfba4 100644
--- 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 fe1c594c5f..dab28c7afb 100644
--- 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;
 	}
 }