From ae4ff80250e474d288655b63f29f38bb93a68ff7 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 24 Jul 2006 20:10:12 +0000 Subject: [PATCH] Add MysqlCDR to mod_cdr build on windows. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2085 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/event_handlers/mod_cdr/mod_cdr.vcproj | 8 +- src/mod/event_handlers/mod_cdr/mysqlcdr.cpp | 34 +-- w32/vsnet/FreeSwitchConsole.vcproj | 160 -------------- w32/vsnet/FreeSwitchCore.vcproj | 196 ------------------ w32/vsnet/FreeSwitchVersion.vcproj | 46 ---- w32/vsnet/Freeswitch.sln | 4 +- 6 files changed, 23 insertions(+), 425 deletions(-) diff --git a/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj b/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj index 0ca64134df..f845153131 100644 --- a/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj +++ b/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj @@ -207,7 +207,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -225,7 +225,7 @@ /> 0) process_channel_variables(chanvars_fixed_list,newchannel->channel); @@ -232,12 +232,12 @@ void MysqlCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& setti mysql_autocommit(conn,0); stmt = mysql_stmt_init(conn); - mysql_stmt_prepare(stmt,sql_query,strlen(sql_query)); + mysql_stmt_prepare(stmt,sql_query,(long unsigned int)strlen(sql_query)); if(logchanvars) { stmt_chanvars = mysql_stmt_init(conn); - mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,strlen(sql_query_chanvars)); + mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,(long unsigned int)strlen(sql_query_chanvars)); } } } @@ -408,7 +408,7 @@ bool MysqlCDR::process_record() case CDR_DECIMAL: { long unsigned int* stringlength = new long unsigned int; - *stringlength = iItr->second.size(); + *stringlength = (long unsigned int)(iItr->second.size()); char* x = new char[(*stringlength+1)]; strncpy(x,iItr->second.c_str(),*stringlength); @@ -459,7 +459,7 @@ bool MysqlCDR::process_record() char* varname_temp = &tempfirstvector[0]; bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; - long unsigned int varname_length = iItr->first.size(); + long unsigned int varname_length = (long unsigned int)(iItr->first.size()); bindme_chanvars[1].length = &varname_length; bindme_chanvars[1].buffer_length = varname_length; bindme_chanvars[1].buffer = varname_temp; @@ -473,7 +473,7 @@ bool MysqlCDR::process_record() bindme_chanvars[2].is_null = (my_bool*)1; else { - long unsigned int varvalue_length = iItr->second.size(); + long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); bindme_chanvars[2].length = &varvalue_length; bindme_chanvars[2].buffer_length = varvalue_length; bindme_chanvars[2].buffer = varvalue_temp; diff --git a/w32/vsnet/FreeSwitchConsole.vcproj b/w32/vsnet/FreeSwitchConsole.vcproj index e0e44c0932..bfd558c1e1 100644 --- a/w32/vsnet/FreeSwitchConsole.vcproj +++ b/w32/vsnet/FreeSwitchConsole.vcproj @@ -175,166 +175,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj index 9c7647b320..8afdcd30b6 100644 --- a/w32/vsnet/FreeSwitchCore.vcproj +++ b/w32/vsnet/FreeSwitchCore.vcproj @@ -195,186 +195,6 @@ CommandLine="xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y xcopy "$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.dll" $(Outdir)\ /C /D /Y xcopy "$(Projectdir)..\..\libs\sqlite\$(IntDir) DLL\*.lib" $(Outdir)\ /C /D /Y if not exist $(Outdir)\db md $(Outdir)\db if not exist $(Outdir)\log md $(Outdir)\log if not exist $(Outdir)\log md $(Outdir)\htdocs " /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -403,22 +223,6 @@ UsePrecompiledHeader="1" /> - - - - - - - - - - - - - - - - - - diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln index 7071a4cbed..7c92f5db93 100644 --- a/w32/vsnet/Freeswitch.sln +++ b/w32/vsnet/Freeswitch.sln @@ -384,8 +384,8 @@ Global {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.Build.0 = Debug|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 - {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug with MySql|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug with MySql|Win32 {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.ActiveCfg = Release|Win32 {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection