[tor-commits] [tor/master] Fix test_util.c compilation on MSVC

[nickm at torproject.org]

commit af12a7ac002cd1900e586461baac617b68a624f8
Author: Gisle Vanem <gvanem at broadpark.no>
Date:   Fri Nov 11 23:49:02 2011 -0500

    Fix test_util.c compilation on MSVC
    
    "Those '{}' constructs are not well liked by MSVC (cl v.16.xx)."
    
    Received on tor-dev; fixes bug on 0.2.3.3-alpha.
---
 changes/fix-msvc     |    4 ++++
 src/test/test_util.c |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/fix-msvc b/changes/fix-msvc
new file mode 100644
index 0000000..62f0547
--- /dev/null
+++ b/changes/fix-msvc
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Make util unit tests build correctly with MSVC. Bugfix on 
+      0.2.3.3-alpha. Patch by Gisle Vanem.
+
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 2146299..64bf52e 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1597,7 +1597,7 @@ test_util_join_win_cmdline(void *ptr)
     {"a\\\\\\b", "de fg", "H", NULL}, // Backslashes
     {"a\\\"b", "\\c", "D\\", NULL}, // Backslashes before quote
     {"a\\\\b c", "d", "E", NULL}, // Backslashes not before quote
-    {} // Terminator
+    { NULL } // Terminator
   };
 
   const char *cmdlines[] = {
@@ -1649,7 +1649,7 @@ test_util_split_lines(void *ptr)
     {"\n\rfoo\n\rbar\r\n", 12, {"foo", "bar", NULL}},
     {"fo o\r\nb\tar", 10, {"fo o", "b.ar", NULL}},
     {"\x0f""f\0o\0\n\x01""b\0r\0\r", 12, {".f.o.", ".b.r.", NULL}},
-    {NULL, 0, {}}
+    {NULL, 0, { NULL }}
   };
 
   int i, j;