VS2008 cleanup for Core Curl integration

diff --git a/Freeswitch.2008.express.sln b/Freeswitch.2008.express.sln
index b4f1f60201495e49a837141da921a0e138ad596b..43cbc02d0e8c721b5c14fdbb66896f520dbe8751 100644 (file)
--- a/Freeswitch.2008.express.sln
+++ b/Freeswitch.2008.express.sln
@@ -9,12 +9,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Co
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2008.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE} = {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}\r
                {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}\r
                {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}\r
                {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}\r
                {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}\r
                {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}\r
                {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}\r
+               {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}\r
                {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}\r
                {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}\r
        EndProjectSection\r

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index f915005e7c9c8a6dbd00710d7fe781f1de7f0355..4061116d07360971257798bbc12335296d7bf8ab 100644 (file)
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -379,12 +379,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Co
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2008.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {D331904D-A00A-4694-A5A3-FCFF64AB5DBE} = {D331904D-A00A-4694-A5A3-FCFF64AB5DBE}\r
                {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}\r
                {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}\r
                {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}\r
                {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}\r
                {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}\r
                {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}\r
+               {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}\r
                {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}\r
                {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}\r
        EndProjectSection\r

diff --git a/src/include/switch.h b/src/include/switch.h
index 268243e98999790e726687dc10202d5618663d69..2f5cf72f30590430461417f85910be275653b95c 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -137,9 +137,7 @@
 #include "switch_odbc.h"
 #include "switch_json.h"
 #include "switch_limit.h"
-#ifndef WIN32
 #include "switch_curl.h"
-#endif
 
 #include <libteletone.h>
 

diff --git a/src/include/switch_curl.h b/src/include/switch_curl.h
index f664b0bc9531fa0ab749fd899799437a55745cc3..d3661226e0941b45f1ba2ab19b11b6bc9ba09fd2 100644 (file)
--- a/src/include/switch_curl.h
+++ b/src/include/switch_curl.h
@@ -40,8 +40,8 @@
 
 SWITCH_BEGIN_EXTERN_C
 
-void switch_curl_init(switch_memory_pool_t *pool);
-void switch_curl_destroy(void);
+SWITCH_DECLARE(void) switch_curl_init(switch_memory_pool_t *pool);
+SWITCH_DECLARE(void) switch_curl_destroy(void);
 
 SWITCH_END_EXTERN_C
 

diff --git a/src/switch_core.c b/src/switch_core.c
index 538dffdb7440fa53d336e9749886e38d554a2e7c..3ea92a51136aaad24993f065e87e60b543a54ee6 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1446,9 +1446,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        switch_uuid_get(&uuid);
        switch_uuid_format(runtime.uuid_str, &uuid);
 
-#ifndef WIN32
        switch_curl_init(runtime.memory_pool);
-#endif
 
        return SWITCH_STATUS_SUCCESS;
 }
@@ -2120,9 +2118,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n");
 
        switch_loadable_module_shutdown();
-#ifndef WIN32
        switch_curl_destroy();
-#endif
 
        if (switch_test_flag((&runtime), SCF_USE_SQL)) {
                switch_core_sqldb_stop();

diff --git a/src/switch_curl.c b/src/switch_curl.c
index d31332ec79b82a09e0870db1cff3ef1463faa601..94af5bdca90651cd69b014c85da3bc342a5130cf 100644 (file)
--- a/src/switch_curl.c
+++ b/src/switch_curl.c
@@ -64,7 +64,7 @@ static void switch_curl_init_ssl_locks(switch_memory_pool_t *pool)
        }
 
        CRYPTO_set_id_callback(switch_curl_ssl_thread_id);
-       CRYPTO_set_locking_callback((void (*)())switch_curl_ssl_lock_callback);
+       CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))switch_curl_ssl_lock_callback);
 }
 
 static void switch_curl_destroy_ssl_locks()

diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index 6ba5b95959fb83e1324cb90729eb90c38e9c909c..557be16f1e380cc8718ff4e3f28465a62c2d0bfa 100644 (file)
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -47,8 +47,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;&quot;..\..\libs\tiff-3.8.2\libtiff&quot;;&quot;..\..\libs\openssl-1.0.0a\include&quot;;..\..\libs\curl\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -141,8 +141,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;&quot;..\..\libs\tiff-3.8.2\libtiff&quot;;&quot;..\..\libs\openssl-1.0.0a\include&quot;;..\..\libs\curl\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -234,8 +234,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;&quot;..\..\libs\tiff-3.8.2\libtiff&quot;;&quot;..\..\libs\openssl-1.0.0a\include&quot;;..\..\libs\curl\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="switch.h"\r
@@ -324,8 +324,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;&quot;..\..\libs\tiff-3.8.2\libtiff&quot;;&quot;..\..\libs\openssl-1.0.0a\include&quot;;..\..\libs\curl\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="switch.h"\r
@@ -690,6 +690,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\switch_curl.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\switch_dso.c"\r
                                >\r
@@ -1444,6 +1448,10 @@
                                RelativePath="..\..\src\include\switch_cpp.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\include\switch_curl.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\include\switch_dso.h"\r
                                >\r