Merge pull request #535 from sgraham/fix-windows-depslog

fix windows build after depslog

7 files changed, 17 insertions, 14 deletions

diff --git a/bootstrap.py b/bootstrap.py
index 4d9bc84..f83b2d0 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -127,8 +127,7 @@ if options.verbose:
 
 if options.windows:
     print('Building ninja using itself...')
-    run([sys.executable, 'configure.py', '--with-ninja=%s' % binary] +
-        conf_args)
+    run([sys.executable, 'configure.py'] + conf_args)
     run(['./' + binary] + verbose)
 
     # Copy the new executable over the bootstrap one.
diff --git a/src/build.cc b/src/build.cc
index ab3d781..39e3e2a 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -247,7 +247,7 @@ void BuildStatus::PrintStatus(Edge* edge) {
   to_print = FormatProgressStatus(progress_status_format_) + to_print;
 
   printer_.Print(to_print,
-                 force_full_command ? LinePrinter::FULL : LinePrinter::SHORT);
+                 force_full_command ? LinePrinter::FULL : LinePrinter::ELIDE);
 }
 
 Plan::Plan() : command_edges_(0), wanted_edges_(0) {}
diff --git a/src/build.h b/src/build.h
index 9a16990..ca75ade 100644
--- a/src/build.h
+++ b/src/build.h
@@ -275,10 +275,6 @@ struct BuildStatus {
 
   mutable RateInfo overall_rate_;
   mutable SlidingRateInfo current_rate_;
-
-#ifdef _WIN32
-  void* console_;
-#endif
 };
 
 #endif  // NINJA_BUILD_H_
diff --git a/src/deps_log.cc b/src/deps_log.cc
index 79daba5..ceb75ce 100644
--- a/src/deps_log.cc
+++ b/src/deps_log.cc
@@ -18,7 +18,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 #include "graph.h"
 #include "metrics.h"
diff --git a/src/line_printer.cc b/src/line_printer.cc
index d30dd2c..751fb07 100644
--- a/src/line_printer.cc
+++ b/src/line_printer.cc
@@ -57,7 +57,7 @@ void LinePrinter::Print(std::string to_print, LineType type) {
 #endif
   }
 
-  if (smart_terminal_ && type == SHORT) {
+  if (smart_terminal_ && type == ELIDE) {
 #ifdef _WIN32
     // Don't use the full width or console will move to next line.
     size_t width = static_cast<size_t>(csbi.dwSize.X) - 1;
@@ -68,9 +68,11 @@ void LinePrinter::Print(std::string to_print, LineType type) {
     GetConsoleScreenBufferInfo(console_, &csbi);
     COORD buf_size = { csbi.dwSize.X, 1 };
     COORD zero_zero = { 0, 0 };
-    SMALL_RECT target = { csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y,
-                          (SHORT)(csbi.dwCursorPosition.X + csbi.dwSize.X - 1),
-                          csbi.dwCursorPosition.Y };
+    SMALL_RECT target = {
+      csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y,
+      static_cast<SHORT>(csbi.dwCursorPosition.X + csbi.dwSize.X - 1),
+      csbi.dwCursorPosition.Y
+    };
     CHAR_INFO* char_data = new CHAR_INFO[csbi.dwSize.X];
     memset(char_data, 0, sizeof(CHAR_INFO) * csbi.dwSize.X);
     for (int i = 0; i < csbi.dwSize.X; ++i) {
diff --git a/src/line_printer.h b/src/line_printer.h
index 78510ea..4226c92 100644
--- a/src/line_printer.h
+++ b/src/line_printer.h
@@ -28,9 +28,9 @@ class LinePrinter {
 
   enum LineType {
     FULL,
-    SHORT
+    ELIDE
   };
-  /// Overprints the current line. If type is SHORT, elides to_print to fit on
+  /// Overprints the current line. If type is ELIDE, elides to_print to fit on
   /// one line.
   void Print(std::string to_print, LineType type);
 
@@ -43,6 +43,10 @@ class LinePrinter {
 
   /// Whether the caret is at the beginning of a blank line.
   bool have_blank_line_;
+
+#ifdef _WIN32
+  void* console_;
+#endif
 };
 
 #endif  // NINJA_LINE_PRINTER_H_
diff --git a/src/ninja_test.cc b/src/ninja_test.cc
index 3376050..02f2c6b 100644
--- a/src/ninja_test.cc
+++ b/src/ninja_test.cc
@@ -42,7 +42,7 @@ class LaconicPrinter : public testing::EmptyTestEventListener {
     ++tests_started_;
     printer_.Print(StringPrintf("[%d/%d] %s.%s", tests_started_, test_count_,
                                 test_info.test_case_name(), test_info.name()),
-                   LinePrinter::SHORT);
+                   LinePrinter::ELIDE);
   }
 
   virtual void OnTestPartResult(