diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-05-06 13:41:33 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-05-06 13:41:33 -0700 |
| commit | d9845938554c47ab26847d8ea7a5d4f44e4a908b (patch) | |
| tree | 584f1a16bca42e102a1584ca00adaa4d24e9589c | |
| parent | 81e68287bb65a4bb57ef000e3890c237504bb555 (diff) | |
| parent | c4057a13f1299db5b2d6621a4158984da893bc5e (diff) | |
| download | gem5-d9845938554c47ab26847d8ea7a5d4f44e4a908b.tar.xz | |
Merge.
| -rw-r--r-- | src/base/stats/visit.hh | 5 | ||||
| -rw-r--r-- | src/kern/tru64/tru64.hh | 2 | ||||
| -rw-r--r-- | src/sim/syscall_emul.hh | 6 |
3 files changed, 5 insertions, 8 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/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; 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 |