From 23a7aa78bf2a8fffc27eec74e928c6681d11f094 Mon Sep 17 00:00:00 2001
From: Evan Martin <martine@danga.com>
Date: Sun, 1 May 2011 20:08:26 -0700
Subject: [PATCH] windows: use abstractions in ninja.cc

---
 src/ninja.cc | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/ninja.cc b/src/ninja.cc
index 43b19ea..fbae091 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -15,11 +15,6 @@
 #include "ninja.h"
 
 #include <errno.h>
-#ifdef WIN32
-#include "getopt.h"
-#else
-#include <getopt.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -31,6 +26,14 @@
 #include <sys/sysinfo.h>
 #endif
 
+#ifdef WIN32
+#include "getopt.h"
+#include <direct.h>
+#include <windows.h>
+#else
+#include <getopt.h>
+#endif
+
 #include "browse.h"
 #include "build.h"
 #include "build_log.h"
@@ -378,7 +381,11 @@ int main(int argc, char** argv) {
   argc -= optind;
 
   if (working_dir) {
+#ifdef _WIN32
+    if (_chdir(working_dir) < 0) {
+#else
     if (chdir(working_dir) < 0) {
+#endif
       Fatal("chdir to '%s' - %s", working_dir, strerror(errno));
     }
   }
@@ -416,7 +423,7 @@ int main(int argc, char** argv) {
   const char* kLogPath = ".ninja_log";
   string log_path = kLogPath;
   if (!build_dir.empty()) {
-    if (mkdir(build_dir.c_str(), 0777) < 0 && errno != EEXIST) {
+    if (MakeDir(build_dir) < 0 && errno != EEXIST) {
       Error("creating build directory %s: %s",
             build_dir.c_str(), strerror(errno));
       return 1;
-- 
2.7.4