summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/fix-msvc4
-rw-r--r--src/test/test_util.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/fix-msvc b/changes/fix-msvc
new file mode 100644
index 0000000000..62f05476b9
--- /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 2146299f98..64bf52e7b1 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;