From f25b8448e47360a807b4b5fae3a84092c84f1468 Mon Sep 17 00:00:00 2001
From: Zach Hindes <zach@dowhatnow.net>
Date: Wed, 12 Sep 2018 15:32:30 -0500
Subject: [PATCH] Support default __stdcall calling convention on tests as well

---
 CMakeLists.txt          | 2 ++
 tests/cjson_add.c       | 4 ++--
 tests/compare_tests.c   | 2 +-
 tests/misc_tests.c      | 4 ++--
 tests/parse_array.c     | 2 +-
 tests/parse_examples.c  | 2 +-
 tests/parse_hex4.c      | 2 +-
 tests/parse_number.c    | 2 +-
 tests/parse_object.c    | 2 +-
 tests/parse_string.c    | 2 +-
 tests/parse_value.c     | 2 +-
 tests/parse_with_opts.c | 2 +-
 tests/print_array.c     | 2 +-
 tests/print_number.c    | 2 +-
 tests/print_object.c    | 2 +-
 tests/print_string.c    | 2 +-
 tests/print_value.c     | 2 +-
 tests/readme_examples.c | 2 +-
 18 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9d2db9..00bf771 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ if (ENABLE_CUSTOM_COMPILER_FLAGS)
             -Wswitch-enum
         )
     elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
+        # Disable warning c4001 - nonstandard extension 'single line comment' was used
+        # Define _CRT_SECURE_NO_WARNINGS to disable deprecation warnings for "insecure" C library functions
         list(APPEND custom_compiler_flags
             /GS
             /Za
diff --git a/tests/cjson_add.c b/tests/cjson_add.c
index eb9def2..00ffc34 100644
--- a/tests/cjson_add.c
+++ b/tests/cjson_add.c
@@ -28,7 +28,7 @@
 #include "unity/src/unity.h"
 #include "common.h"
 
-static void *failing_malloc(size_t size)
+static void * CJSON_CDECL failing_malloc(size_t size)
 {
     (void)size;
     return NULL;
@@ -378,7 +378,7 @@ static void cjson_add_array_should_fail_on_allocation_failure(void)
     cJSON_Delete(root);
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();
 
diff --git a/tests/compare_tests.c b/tests/compare_tests.c
index 63b6d4a..307d0e8 100644
--- a/tests/compare_tests.c
+++ b/tests/compare_tests.c
@@ -186,7 +186,7 @@ static void cjson_compare_should_compare_objects(void)
                 false))
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();
 
diff --git a/tests/misc_tests.c b/tests/misc_tests.c
index a0b4f7e..f42772a 100644
--- a/tests/misc_tests.c
+++ b/tests/misc_tests.c
@@ -410,7 +410,7 @@ static void cjson_functions_shouldnt_crash_with_null_pointers(void)
     cJSON_Delete(item);
 }
 
-static void *failing_realloc(void *pointer, size_t size)
+static void * CJSON_CDECL failing_realloc(void *pointer, size_t size)
 {
     (void)size;
     (void)pointer;
@@ -527,7 +527,7 @@ static void cjson_add_item_to_object_should_not_use_after_free_when_string_is_al
     cJSON_Delete(object);
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();
 
diff --git a/tests/parse_array.c b/tests/parse_array.c
index 69e0f41..dfaae29 100644
--- a/tests/parse_array.c
+++ b/tests/parse_array.c
@@ -152,7 +152,7 @@ static void parse_array_should_not_parse_non_arrays(void)
     assert_not_array("\"[]hello world!\n\"");
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     memset(item, 0, sizeof(cJSON));
diff --git a/tests/parse_examples.c b/tests/parse_examples.c
index 76215bb..3aab77f 100644
--- a/tests/parse_examples.c
+++ b/tests/parse_examples.c
@@ -195,7 +195,7 @@ static void test12_should_not_be_parsed(void)
     }
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();
     RUN_TEST(file_test1_should_be_parsed_and_printed);
diff --git a/tests/parse_hex4.c b/tests/parse_hex4.c
index 7115cba..83cbe65 100644
--- a/tests/parse_hex4.c
+++ b/tests/parse_hex4.c
@@ -64,7 +64,7 @@ static void parse_hex4_should_parse_mixed_case(void)
     TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BEEF"));
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();
     RUN_TEST(parse_hex4_should_parse_all_combinations);
diff --git a/tests/parse_number.c b/tests/parse_number.c
index f499ab6..4cb72ec 100644
--- a/tests/parse_number.c
+++ b/tests/parse_number.c
@@ -96,7 +96,7 @@ static void parse_number_should_parse_negative_reals(void)
     assert_parse_number("-123e-128", 0, -123e-128);
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     memset(item, 0, sizeof(cJSON));
diff --git a/tests/parse_object.c b/tests/parse_object.c
index 0985845..5f8e7cf 100644
--- a/tests/parse_object.c
+++ b/tests/parse_object.c
@@ -162,7 +162,7 @@ static void parse_object_should_not_parse_non_objects(void)
     assert_not_object("\"{}hello world!\n\"");
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     memset(item, 0, sizeof(cJSON));
diff --git a/tests/parse_string.c b/tests/parse_string.c
index ceb1a89..ce1c138 100644
--- a/tests/parse_string.c
+++ b/tests/parse_string.c
@@ -119,7 +119,7 @@ static void parse_string_should_parse_bug_94(void)
     reset(item);
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item and error pointer */
     memset(item, 0, sizeof(cJSON));
diff --git a/tests/parse_value.c b/tests/parse_value.c
index 08ec3e7..6b6b095 100644
--- a/tests/parse_value.c
+++ b/tests/parse_value.c
@@ -96,7 +96,7 @@ static void parse_value_should_parse_object(void)
     reset(item);
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     memset(item, 0, sizeof(cJSON));
diff --git a/tests/parse_with_opts.c b/tests/parse_with_opts.c
index 84b69cf..e390b92 100644
--- a/tests/parse_with_opts.c
+++ b/tests/parse_with_opts.c
@@ -97,7 +97,7 @@ static void parse_with_opts_should_parse_utf8_bom(void)
     cJSON_Delete(without_bom);
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();
 
diff --git a/tests/print_array.c b/tests/print_array.c
index 4bee17f..7d40f2e 100644
--- a/tests/print_array.c
+++ b/tests/print_array.c
@@ -87,7 +87,7 @@ static void print_array_should_print_arrays_with_multiple_elements(void)
     assert_print_array("[1, null, true, false, [], \"hello\", {\n\t}]", "[1,null,true,false,[],\"hello\",{}]");
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     UNITY_BEGIN();
diff --git a/tests/print_number.c b/tests/print_number.c
index 5ebb348..f2385f3 100644
--- a/tests/print_number.c
+++ b/tests/print_number.c
@@ -89,7 +89,7 @@ static void print_number_should_print_non_number(void)
     /* assert_print_number("null", -INFTY); */
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     UNITY_BEGIN();
diff --git a/tests/print_object.c b/tests/print_object.c
index 70bbb43..3ed0bfe 100644
--- a/tests/print_object.c
+++ b/tests/print_object.c
@@ -88,7 +88,7 @@ static void print_object_should_print_objects_with_multiple_elements(void)
     assert_print_object("{\n\t\"one\":\t1,\n\t\"NULL\":\tnull,\n\t\"TRUE\":\ttrue,\n\t\"FALSE\":\tfalse,\n\t\"array\":\t[],\n\t\"world\":\t\"hello\",\n\t\"object\":\t{\n\t}\n}", "{\"one\":1,\"NULL\":null,\"TRUE\":true,\"FALSE\":false,\"array\":[],\"world\":\"hello\",\"object\":{}}");
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     UNITY_BEGIN();
diff --git a/tests/print_string.c b/tests/print_string.c
index 83de1e7..e6f5b92 100644
--- a/tests/print_string.c
+++ b/tests/print_string.c
@@ -65,7 +65,7 @@ static void print_string_should_print_utf8(void)
     assert_print_string("\"ü猫慕\"", "ü猫慕");
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     UNITY_BEGIN();
diff --git a/tests/print_value.c b/tests/print_value.c
index d590823..b54db5b 100644
--- a/tests/print_value.c
+++ b/tests/print_value.c
@@ -90,7 +90,7 @@ static void print_value_should_print_object(void)
     assert_print_value("{}");
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     /* initialize cJSON item */
     UNITY_BEGIN();
diff --git a/tests/readme_examples.c b/tests/readme_examples.c
index f3fa443..1ab1b13 100644
--- a/tests/readme_examples.c
+++ b/tests/readme_examples.c
@@ -246,7 +246,7 @@ static void supports_full_hd_should_check_for_full_hd_support(void)
     TEST_ASSERT_FALSE(supports_full_hd(monitor_without_hd));
 }
 
-int main(void)
+int CJSON_CDECL main(void)
 {
     UNITY_BEGIN();