From f07ee128ccebec4653e85c07fbd2c1225c968b23 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 6 May 2010 08:42:18 -0700 Subject: 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/sim/syscall_emul.hh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/sim') 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 -#include #ifdef __CYGWIN32__ #include // for O_BINARY #endif #include +#include #include #include +#include + +#include #include "base/chunk_generator.hh" #include "base/intmath.hh" // for RoundUp -- cgit v1.2.3