windows trivial compiler fixes and vs2010 reswig
This commit is contained in:
Jeff Lenk
parent
00def46a64
commit
fe4d736ff9
|
|
@ -106,7 +106,11 @@
|
|||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef WIN32
|
||||
#include "stfu.h"
|
||||
#else
|
||||
#include "../../../libs/stfu/stfu.h"
|
||||
#endif
|
||||
#include "switch_platform.h"
|
||||
#include "switch_types.h"
|
||||
#include "switch_apr.h"
|
||||
|
|
|
|||
|
|
@ -1840,6 +1840,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DTMF_LOG_LEN_get() {
|
|||
}
|
||||
|
||||
|
||||
SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_TRANS_get() {
|
||||
int jresult ;
|
||||
int result;
|
||||
|
||||
result = (int)(2000);
|
||||
jresult = result;
|
||||
return jresult;
|
||||
}
|
||||
|
||||
|
||||
SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char jarg2) {
|
||||
switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;
|
||||
char arg2 ;
|
||||
|
|
@ -2310,6 +2320,36 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_mod_dir_get(void * jarg1
|
|||
}
|
||||
|
||||
|
||||
SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_lib_dir_set(void * jarg1, char * jarg2) {
|
||||
switch_directories *arg1 = (switch_directories *) 0 ;
|
||||
char *arg2 = (char *) 0 ;
|
||||
|
||||
arg1 = (switch_directories *)jarg1;
|
||||
arg2 = (char *)jarg2;
|
||||
{
|
||||
if (arg1->lib_dir) delete [] arg1->lib_dir;
|
||||
if (arg2) {
|
||||
arg1->lib_dir = (char *) (new char[strlen((const char *)arg2)+1]);
|
||||
strcpy((char *)arg1->lib_dir, (const char *)arg2);
|
||||
} else {
|
||||
arg1->lib_dir = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_lib_dir_get(void * jarg1) {
|
||||
char * jresult ;
|
||||
switch_directories *arg1 = (switch_directories *) 0 ;
|
||||
char *result = 0 ;
|
||||
|
||||
arg1 = (switch_directories *)jarg1;
|
||||
result = (char *) ((arg1)->lib_dir);
|
||||
jresult = SWIG_csharp_string_callback((const char *)result);
|
||||
return jresult;
|
||||
}
|
||||
|
||||
|
||||
SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_conf_dir_set(void * jarg1, char * jarg2) {
|
||||
switch_directories *arg1 = (switch_directories *) 0 ;
|
||||
char *arg2 = (char *) 0 ;
|
||||
|
|
@ -12048,27 +12088,29 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_destroy(void * jarg1)
|
|||
}
|
||||
|
||||
|
||||
SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_init_name(char * jarg1, void * jarg2, unsigned long jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8) {
|
||||
SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_init_name(char * jarg1, void * jarg2, unsigned long jarg3, char * jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9) {
|
||||
int jresult ;
|
||||
char *arg1 = (char *) 0 ;
|
||||
switch_sql_queue_manager_t **arg2 = (switch_sql_queue_manager_t **) 0 ;
|
||||
uint32_t arg3 ;
|
||||
char *arg4 = (char *) 0 ;
|
||||
char *arg5 = (char *) 0 ;
|
||||
uint32_t arg5 ;
|
||||
char *arg6 = (char *) 0 ;
|
||||
char *arg7 = (char *) 0 ;
|
||||
char *arg8 = (char *) 0 ;
|
||||
char *arg9 = (char *) 0 ;
|
||||
switch_status_t result;
|
||||
|
||||
arg1 = (char *)jarg1;
|
||||
arg2 = (switch_sql_queue_manager_t **)jarg2;
|
||||
arg3 = (uint32_t)jarg3;
|
||||
arg4 = (char *)jarg4;
|
||||
arg5 = (char *)jarg5;
|
||||
arg5 = (uint32_t)jarg5;
|
||||
arg6 = (char *)jarg6;
|
||||
arg7 = (char *)jarg7;
|
||||
arg8 = (char *)jarg8;
|
||||
result = (switch_status_t)switch_sql_queue_manager_init_name((char const *)arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8);
|
||||
arg9 = (char *)jarg9;
|
||||
result = (switch_status_t)switch_sql_queue_manager_init_name((char const *)arg1,arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9);
|
||||
jresult = result;
|
||||
return jresult;
|
||||
}
|
||||
|
|
@ -23326,6 +23368,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_session_get(void * jarg1) {
|
|||
}
|
||||
|
||||
|
||||
SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_cur_frame_set(void * jarg1, void * jarg2) {
|
||||
switch_codec *arg1 = (switch_codec *) 0 ;
|
||||
switch_frame_t *arg2 = (switch_frame_t *) 0 ;
|
||||
|
||||
arg1 = (switch_codec *)jarg1;
|
||||
arg2 = (switch_frame_t *)jarg2;
|
||||
if (arg1) (arg1)->cur_frame = arg2;
|
||||
}
|
||||
|
||||
|
||||
SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_cur_frame_get(void * jarg1) {
|
||||
void * jresult ;
|
||||
switch_codec *arg1 = (switch_codec *) 0 ;
|
||||
switch_frame_t *result = 0 ;
|
||||
|
||||
arg1 = (switch_codec *)jarg1;
|
||||
result = (switch_frame_t *) ((arg1)->cur_frame);
|
||||
jresult = (void *)result;
|
||||
return jresult;
|
||||
}
|
||||
|
||||
|
||||
SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec() {
|
||||
void * jresult ;
|
||||
switch_codec *result = 0 ;
|
||||
|
|
|
|||
|
|
@ -2862,8 +2862,8 @@ public class freeswitch {
|
|||
return ret;
|
||||
}
|
||||
|
||||
public static switch_status_t switch_sql_queue_manager_init_name(string name, SWIGTYPE_p_p_switch_sql_queue_manager qmp, uint numq, string dsn, string pre_trans_execute, string post_trans_execute, string inner_pre_trans_execute, string inner_post_trans_execute) {
|
||||
switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_sql_queue_manager_init_name(name, SWIGTYPE_p_p_switch_sql_queue_manager.getCPtr(qmp), numq, dsn, pre_trans_execute, post_trans_execute, inner_pre_trans_execute, inner_post_trans_execute);
|
||||
public static switch_status_t switch_sql_queue_manager_init_name(string name, SWIGTYPE_p_p_switch_sql_queue_manager qmp, uint numq, string dsn, uint max_trans, string pre_trans_execute, string post_trans_execute, string inner_pre_trans_execute, string inner_post_trans_execute) {
|
||||
switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_sql_queue_manager_init_name(name, SWIGTYPE_p_p_switch_sql_queue_manager.getCPtr(qmp), numq, dsn, max_trans, pre_trans_execute, post_trans_execute, inner_pre_trans_execute, inner_post_trans_execute);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -6371,6 +6371,7 @@ public class freeswitch {
|
|||
public static readonly int SWITCH_BITS_PER_BYTE = freeswitchPINVOKE.SWITCH_BITS_PER_BYTE_get();
|
||||
public static readonly int SWITCH_DEFAULT_FILE_BUFFER_LEN = freeswitchPINVOKE.SWITCH_DEFAULT_FILE_BUFFER_LEN_get();
|
||||
public static readonly int SWITCH_DTMF_LOG_LEN = freeswitchPINVOKE.SWITCH_DTMF_LOG_LEN_get();
|
||||
public static readonly int SWITCH_MAX_TRANS = freeswitchPINVOKE.SWITCH_MAX_TRANS_get();
|
||||
public static readonly int SWITCH_MAX_STACKS = freeswitchPINVOKE.SWITCH_MAX_STACKS_get();
|
||||
public static readonly int SWITCH_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_THREAD_STACKSIZE_get();
|
||||
public static readonly int SWITCH_SYSTEM_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_SYSTEM_THREAD_STACKSIZE_get();
|
||||
|
|
@ -7084,6 +7085,9 @@ class freeswitchPINVOKE {
|
|||
[DllImport("mod_managed", EntryPoint="CSharp_SWITCH_DTMF_LOG_LEN_get")]
|
||||
public static extern int SWITCH_DTMF_LOG_LEN_get();
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_SWITCH_MAX_TRANS_get")]
|
||||
public static extern int SWITCH_MAX_TRANS_get();
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_dtmf_t_digit_set")]
|
||||
public static extern void switch_dtmf_t_digit_set(HandleRef jarg1, char jarg2);
|
||||
|
||||
|
|
@ -7210,6 +7214,12 @@ class freeswitchPINVOKE {
|
|||
[DllImport("mod_managed", EntryPoint="CSharp_switch_directories_mod_dir_get")]
|
||||
public static extern string switch_directories_mod_dir_get(HandleRef jarg1);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_directories_lib_dir_set")]
|
||||
public static extern void switch_directories_lib_dir_set(HandleRef jarg1, string jarg2);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_directories_lib_dir_get")]
|
||||
public static extern string switch_directories_lib_dir_get(HandleRef jarg1);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_directories_conf_dir_set")]
|
||||
public static extern void switch_directories_conf_dir_set(HandleRef jarg1, string jarg2);
|
||||
|
||||
|
|
@ -9542,7 +9552,7 @@ class freeswitchPINVOKE {
|
|||
public static extern int switch_sql_queue_manager_destroy(HandleRef jarg1);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_sql_queue_manager_init_name")]
|
||||
public static extern int switch_sql_queue_manager_init_name(string jarg1, HandleRef jarg2, uint jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8);
|
||||
public static extern int switch_sql_queue_manager_init_name(string jarg1, HandleRef jarg2, uint jarg3, string jarg4, uint jarg5, string jarg6, string jarg7, string jarg8, string jarg9);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_sql_queue_manager_start")]
|
||||
public static extern int switch_sql_queue_manager_start(HandleRef jarg1);
|
||||
|
|
@ -12337,6 +12347,12 @@ class freeswitchPINVOKE {
|
|||
[DllImport("mod_managed", EntryPoint="CSharp_switch_codec_session_get")]
|
||||
public static extern IntPtr switch_codec_session_get(HandleRef jarg1);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_codec_cur_frame_set")]
|
||||
public static extern void switch_codec_cur_frame_set(HandleRef jarg1, HandleRef jarg2);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_switch_codec_cur_frame_get")]
|
||||
public static extern IntPtr switch_codec_cur_frame_get(HandleRef jarg1);
|
||||
|
||||
[DllImport("mod_managed", EntryPoint="CSharp_new_switch_codec")]
|
||||
public static extern IntPtr new_switch_codec();
|
||||
|
||||
|
|
@ -24182,6 +24198,7 @@ public enum switch_channel_flag_t {
|
|||
CF_OUTBOUND,
|
||||
CF_EARLY_MEDIA,
|
||||
CF_BRIDGE_ORIGINATOR,
|
||||
CF_UUID_BRIDGE_ORIGINATOR,
|
||||
CF_TRANSFER,
|
||||
CF_ACCEPT_CNG,
|
||||
CF_REDIRECT,
|
||||
|
|
@ -24950,6 +24967,17 @@ public class switch_codec : IDisposable {
|
|||
}
|
||||
}
|
||||
|
||||
public switch_frame cur_frame {
|
||||
set {
|
||||
freeswitchPINVOKE.switch_codec_cur_frame_set(swigCPtr, switch_frame.getCPtr(value));
|
||||
}
|
||||
get {
|
||||
IntPtr cPtr = freeswitchPINVOKE.switch_codec_cur_frame_get(swigCPtr);
|
||||
switch_frame ret = (cPtr == IntPtr.Zero) ? null : new switch_frame(cPtr, false);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
public switch_codec() : this(freeswitchPINVOKE.new_switch_codec(), true) {
|
||||
}
|
||||
|
||||
|
|
@ -26627,6 +26655,16 @@ public class switch_directories : IDisposable {
|
|||
}
|
||||
}
|
||||
|
||||
public string lib_dir {
|
||||
set {
|
||||
freeswitchPINVOKE.switch_directories_lib_dir_set(swigCPtr, value);
|
||||
}
|
||||
get {
|
||||
string ret = freeswitchPINVOKE.switch_directories_lib_dir_get(swigCPtr);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
public string conf_dir {
|
||||
set {
|
||||
freeswitchPINVOKE.switch_directories_conf_dir_set(swigCPtr, value);
|
||||
|
|
|
|||
|
|
@ -1466,7 +1466,7 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
|
|||
switch_status_t status;
|
||||
uint32_t ttl = 0;
|
||||
switch_mutex_t *io_mutex = qm->event_db->io_mutex;
|
||||
int i;
|
||||
uint32_t i;
|
||||
|
||||
if (io_mutex) switch_mutex_lock(io_mutex);
|
||||
|
||||
|
|
@ -1648,8 +1648,7 @@ static void *SWITCH_THREAD_FUNC switch_user_sql_thread(switch_thread_t *thread,
|
|||
|
||||
|
||||
while (qm->thread_running == 1) {
|
||||
int lc;
|
||||
uint32_t i;
|
||||
uint32_t i, lc;
|
||||
uint32_t written, iterations = 0;
|
||||
|
||||
if (sql_manager.paused) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue