Merge.

src/base/stats/visit.hh

@@ -31,11 +31,6 @@
 #ifndef __BASE_STATS_VISIT_HH__
 #define __BASE_STATS_VISIT_HH__
 
-#include <string>
-
-#include "base/time.hh"
-#include "base/types.hh"
-
 namespace Stats {
 
 class Info;

src/kern/tru64/tru64.hh

@@ -437,7 +437,7 @@ class Tru64 : public OperatingSystem
     {
         using namespace TheISA;
 
-#ifdef __CYGWIN__
+#if defined(__APPLE__) || defined(__CYGWIN__)
         panic("getdirent not implemented on cygwin!");
 #else
         int index = 0;

src/sim/syscall_emul.hh

@@ -41,14 +41,16 @@
 /// This file defines objects used to emulate syscalls from the target
 /// application on the host machine.
 
-#include <errno.h>
-#include <string>
 #ifdef __CYGWIN32__
 #include <sys/fcntl.h>  // for O_BINARY
 #endif
 #include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/uio.h>
+#include <sys/time.h>
+
+#include <string>
 
 #include "base/chunk_generator.hh"
 #include "base/intmath.hh"      // for RoundUp