Merge branch 'fixMingwBuild' into develop

okuoku · Jul 18, 2012 · b33ff36 · b33ff36
2 parents c826bb7 + 2439df1
commit b33ff36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/build.cc b/src/build.cc
@@ -466,7 +466,7 @@ void RealCommandRunner::Abort() {
 
 bool RealCommandRunner::CanRunMore() {
   return ((int)subprocs_.running_.size()) < config_.parallelism
-    && ((subprocs_.running_.size() == 0 || config_.max_load_average <= 0.0f)
+    && ((subprocs_.running_.empty() || config_.max_load_average <= 0.0f)
         || GetLoadAverage() < config_.max_load_average);
 }
 

diff --git a/src/subprocess.cc b/src/subprocess.cc
@@ -25,6 +25,13 @@
 #include <string.h>
 #include <sys/wait.h>
 
+// Older versions of glibc (like 2.4) won't find this in <poll.h>.  glibc
+// 2.4 keeps it in <asm-generic/poll.h>, though attempting to include that
+// will redefine the pollfd structure.
+#ifndef POLLRDHUP
+#define POLLRDHUP 0x2000
+#endif
+
 #include "util.h"
 
 Subprocess::Subprocess() : fd_(-1), pid_(-1) {