diff options
| author | Nathan Binkert <nate@binkert.org> | 2010-05-06 08:42:18 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2010-05-06 08:42:18 -0700 |
| commit | f07ee128ccebec4653e85c07fbd2c1225c968b23 (patch) | |
| tree | 853034d80899ec94ae1f5bf4efbfb2245722b564 | |
| parent | 8b0c83008e6c1964c9606a47213f11599ab186c5 (diff) | |
| download | gem5-f07ee128ccebec4653e85c07fbd2c1225c968b23.tar.xz | |
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.
| -rw-r--r-- | src/base/stats/visit.hh | 5 | ||||
| -rw-r--r-- | 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 |