FS-10167: Added windows compilation of libconfig and libsodium to support libblade, all of which now have windows projects and a new libblade solution containing everything. Blade compiles, but many warnings have been disabled and should be reviewed and fixed where reasonable towards clean compiling. Code Analysis has also been enabled for visual studio projects, warnings beginning with C6XXX can be ignored unless adding code-analysis macros to libks and libblade.

libs/libblade/src/blade_module_wss.c

@@ -756,7 +756,7 @@ ks_status_t blade_transport_wss_write(blade_transport_wss_t *bt_wss, cJSON *json
 	}
 	// @todo determine if WSOC_TEXT null terminates when read_frame is called, or if it's safe to include like this
 	json_str_len = strlen(json_str) + 1;
-	if (kws_write_frame(bt_wss->kws, WSOC_TEXT, json_str, json_str_len) != json_str_len) {
+	if ((ks_size_t)kws_write_frame(bt_wss->kws, WSOC_TEXT, json_str, json_str_len) != json_str_len) {
 		ks_log(KS_LOG_DEBUG, "Failed to write frame\n");
 		ret = KS_STATUS_FAIL;
 		goto done;

libs/libblade/src/dht/ks_dht.c

@@ -1613,7 +1613,7 @@ KS_DECLARE(ks_status_t) ks_dht_process_response(ks_dht_t *dht, ks_dht_message_t
 {
 	struct bencode *r;
 	ks_dht_nodeid_t *id;
-	ks_dht_node_t *node;
+	ks_dht_node_t *node = NULL;
 	ks_dht_transaction_t *transaction;
 	uint32_t *tid;
 	uint32_t transactionid;

libs/libblade/src/include/blade.h

@@ -53,6 +53,10 @@
 
 KS_BEGIN_EXTERN_C
 
+#ifndef config_lookup_from
+#define config_lookup_from config_setting_lookup
+#endif
+
 KS_DECLARE(ks_status_t) blade_init(void);
 KS_DECLARE(ks_status_t) blade_shutdown(void);
 

libs/libblade/src/include/ks_bencode.h

@@ -19,7 +19,7 @@ extern "C" {
 #ifdef __GNUC__
 #define BEN_CHECK_FORMAT(...)  __attribute__ ((format( __VA_ARGS__ )))
 #else
-#define BEN_CHECK_FORMAT(args)
+#define BEN_CHECK_FORMAT(...)
 #endif
 
 enum {

libs/libblade/src/unqlite.c

@@ -1,5 +1,7 @@
+#ifndef _WIN32
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
 
 /*
  * Symisc unQLite: An Embeddable NoSQL (Post Modern) Database Engine.
@@ -60233,4 +60235,6 @@ UNQLITE_PRIVATE int unqliteRegisterJx9Functions(unqlite_vm *pVm)
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _WIN32
 #pragma GCC diagnostic pop
+#endif