From c0c78682508c72940c8c7eee99aaea0da16ce34a Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Aug 2010 12:30:25 -0400
Subject: Make the windows build succeed with or without -DUNICODE enabled.

This should keep WinCE working (unicode always-on) and get Win98
working again (unicode never-on).

There are two places where we explicitly use ASCII-only APIs, still:
in ntmain.c and in the unit tests.

This patch also fixes a bug in windoes tor_listdir that would cause
the first file to be listed an arbitrary number of times that was
also introduced with WinCE support.

Should fix bug 1797.
---
 src/test/tinytest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/test/tinytest.c')

diff --git a/src/test/tinytest.c b/src/test/tinytest.c
index b358bb3a4..b45330812 100644
--- a/src/test/tinytest.c
+++ b/src/test/tinytest.c
@@ -111,7 +111,7 @@ _testcase_run_forked(const struct testgroup_t *group,
 	 */
 	int ok;
 	char buffer[LONGEST_TEST_NAME+256];
-	STARTUPINFO si;
+	STARTUPINFOA si;
 	PROCESS_INFORMATION info;
 	DWORD exitcode;
 
@@ -130,7 +130,7 @@ _testcase_run_forked(const struct testgroup_t *group,
 	memset(&info, 0, sizeof(info));
 	si.cb = sizeof(si);
 
-	ok = CreateProcess(commandname, buffer, NULL, NULL, 0,
+	ok = CreateProcessA(commandname, buffer, NULL, NULL, 0,
 			   0, NULL, NULL, &si, &info);
 	if (!ok) {
 		printf("CreateProcess failed!\n");
-- 
cgit v1.2.3