VS2008 cleanup for Core Curl integration

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>
 

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
 

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();

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()