From 6be76e56b748479f980e3406141088ba4e27fb15 Mon Sep 17 00:00:00 2001 From: Nicolas Despres Date: Sat, 19 Nov 2011 18:40:21 +0100 Subject: Use more portable way to get the current process ID. GetProcessId() is available only since Windows XP. Since MinGW define WINVER to 0x0400 which is Windows 2000 I think, we have a compilation error. Using GetCurrentProcessId() instead of GetProcessId(GetCurrentProcess()) fix this issue. --- src/subprocess-win32.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc index acc789c..6e5ebab 100644 --- a/src/subprocess-win32.cc +++ b/src/subprocess-win32.cc @@ -15,7 +15,6 @@ #include "subprocess.h" #include -#include #include @@ -55,7 +54,7 @@ Subprocess::~Subprocess() { HANDLE Subprocess::SetupPipe(HANDLE ioport) { char pipe_name[100]; snprintf(pipe_name, sizeof(pipe_name), - "\\\\.\\pipe\\ninja_pid%u_sp%p", GetProcessId(GetCurrentProcess()), this); + "\\\\.\\pipe\\ninja_pid%u_sp%p", GetCurrentProcessId(), this); pipe_ = ::CreateNamedPipeA(pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, -- cgit v0.12 From 657a0b919f2ff7e79ce4e1f555c50f23226e3ee2 Mon Sep 17 00:00:00 2001 From: Nicolas Despres Date: Sat, 19 Nov 2011 18:49:38 +0100 Subject: Fix compilation warning with getopt_long() on MinGW. --- src/getopt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/getopt.h b/src/getopt.h index 20a7dc7..ead9878 100644 --- a/src/getopt.h +++ b/src/getopt.h @@ -41,9 +41,9 @@ extern "C" /* function prototypes */ int getopt (int argc, char **argv, char *optstring); int getopt_long (int argc, char **argv, const char *shortopts, - GETOPT_LONG_OPTION_T * longopts, int *longind); + const GETOPT_LONG_OPTION_T * longopts, int *longind); int getopt_long_only (int argc, char **argv, const char *shortopts, - GETOPT_LONG_OPTION_T * longopts, int *longind); + const GETOPT_LONG_OPTION_T * longopts, int *longind); #ifdef __cplusplus }; -- cgit v0.12 From b79f3fcef98ad316832e128dd240b47d06979ba0 Mon Sep 17 00:00:00 2001 From: Nicolas Despres Date: Sat, 19 Nov 2011 18:54:05 +0100 Subject: Fix compilation warning with getopt() on MinGW. --- src/ninja.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ninja.cc b/src/ninja.cc index b2c8da0..9c0a90f 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -412,7 +412,7 @@ int CmdClean(State* state, int argc, char* argv[], const BuildConfig& config) { optind = 1; int opt; - while ((opt = getopt(argc, argv, "gr")) != -1) { + while ((opt = getopt(argc, argv, const_cast("gr"))) != -1) { switch (opt) { case 'g': generator = true; -- cgit v0.12