changeset 24379f92cc10 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=24379f92cc10
description:
Merge.
diffstat:
src/base/stats/visit.hh | 5 -----
src/kern/tru64/tru64.hh | 2 +-
src/sim/syscall_emul.hh | 6 ++++--
3 files changed, 5 insertions(+), 8 deletions(-)
diffs (49 lines):
diff -r b9480b90cf18 -r 24379f92cc10 src/base/stats/visit.hh
--- a/src/base/stats/visit.hh Thu May 06 13:41:08 2010 -0700
+++ b/src/base/stats/visit.hh Thu May 06 13:41:33 2010 -0700
@@ -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 -r b9480b90cf18 -r 24379f92cc10 src/kern/tru64/tru64.hh
--- a/src/kern/tru64/tru64.hh Thu May 06 13:41:08 2010 -0700
+++ b/src/kern/tru64/tru64.hh Thu May 06 13:41:33 2010 -0700
@@ -437,7 +437,7 @@
{
using namespace TheISA;
-#ifdef __CYGWIN__
+#if defined(__APPLE__) || defined(__CYGWIN__)
panic("getdirent not implemented on cygwin!");
#else
int index = 0;
diff -r b9480b90cf18 -r 24379f92cc10 src/sim/syscall_emul.hh
--- a/src/sim/syscall_emul.hh Thu May 06 13:41:08 2010 -0700
+++ b/src/sim/syscall_emul.hh Thu May 06 13:41:33 2010 -0700
@@ -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
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
