FSBUILD-278
This commit is contained in:
parent
7566575523
commit
ea5e699cb2
|
@ -35,7 +35,7 @@
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define FAX_INVALID_SOCKET INVALID_HANDLE_VALUE
|
#define FAX_INVALID_SOCKET INVALID_HANDLE_VALUE
|
||||||
typedef HANDLE fax_socket_t;
|
typedef HANDLE zap_socket_t;
|
||||||
#else
|
#else
|
||||||
#define FAX_INVALID_SOCKET -1
|
#define FAX_INVALID_SOCKET -1
|
||||||
typedef int zap_socket_t;
|
typedef int zap_socket_t;
|
||||||
|
|
|
@ -1142,9 +1142,10 @@ SWITCH_DECLARE(int) globalSetVariable(const char *var, const char *val, const ch
|
||||||
if (zstr(val2)) val2 = NULL;
|
if (zstr(val2)) val2 = NULL;
|
||||||
|
|
||||||
if (val2) {
|
if (val2) {
|
||||||
switch_core_set_var_conditional(var, val, val2);
|
return switch_core_set_var_conditional(var, val, val2);
|
||||||
} else {
|
} else {
|
||||||
switch_core_set_variable(var, val);
|
switch_core_set_variable(var, val);
|
||||||
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue