From f07ee128ccebec4653e85c07fbd2c1225c968b23 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Thu, 6 May 2010 08:42:18 -0700
Subject: [PATCH 1/2] compile: don't #include unnecessary stuff Time from
 base/time.hh has a name clash with Time from Ruby's TypeDefines.hh. 
 Eventually Ruby's Time should go away, so instead of fixing this properly
 just try to avoid the clash.

---
 src/base/stats/visit.hh | 5 -----
 src/sim/syscall_emul.hh | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index c9fab19a3..f5c2fc34c 100644
--- a/src/base/stats/visit.hh
+++ b/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;
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 6016ccfd9..703bbd1e0 100644
--- a/src/sim/syscall_emul.hh
+++ b/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

From c4057a13f1299db5b2d6621a4158984da893bc5e Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Thu, 6 May 2010 08:42:21 -0700
Subject: [PATCH 2/2] macos: MacOS has deprecated getdirentries, so just
 disable the code. Hopefully it isn't used much

---
 src/kern/tru64/tru64.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kern/tru64/tru64.hh b/src/kern/tru64/tru64.hh
index 033f30946..d0c11a934 100644
--- a/src/kern/tru64/tru64.hh
+++ b/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;