From 60f0af860fa8e4f7064cec813ddbba019add8412 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 23 Sep 2013 05:36:50 +0000 Subject: [PATCH] fix mingw build of tests --- test/setup_transfer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/setup_transfer.cpp b/test/setup_transfer.cpp index 02df236ba..cd6bbd52c 100644 --- a/test/setup_transfer.cpp +++ b/test/setup_transfer.cpp @@ -285,12 +285,14 @@ void test_sleep(int millisec) } #ifdef _WIN32 -typedef DWORD pid_t; +typedef DWORD pid_type; +#else +typedef pid_t pid_type; #endif struct proxy_t { - pid_t pid; + pid_type pid; int type; }; @@ -306,7 +308,7 @@ void stop_proxy(int port) } // returns 0 on failure, otherwise pid -pid_t async_run(char const* cmdline) +pid_type async_run(char const* cmdline) { #ifdef _WIN32 char buf[2048]; @@ -329,7 +331,7 @@ pid_t async_run(char const* cmdline) } return pi.dwProcessId; #else - pid_t p; + pid_type p; char arg_storage[4096]; char* argp = arg_storage; std::vector argv;