sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge.

Browse source
This commit is contained in:
Gabe Black 2010-05-06 13:41:33 -07:00
commit d984593855
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/base/stats/visit.hh
View file

@ -31,11 +31,6 @@
#ifndef __BASE_STATS_VISIT_HH__ #ifndef __BASE_STATS_VISIT_HH__
#define __BASE_STATS_VISIT_HH__ #define __BASE_STATS_VISIT_HH__
#include <string>
#include "base/time.hh"
#include "base/types.hh"
namespace Stats { namespace Stats {
class Info; class Info;

2
src/kern/tru64/tru64.hh
View file

@ -437,7 +437,7 @@ class Tru64 : public OperatingSystem
{ {
using namespace TheISA; using namespace TheISA;
#ifdef __CYGWIN__ #if defined(__APPLE__) || defined(__CYGWIN__)
panic("getdirent not implemented on cygwin!"); panic("getdirent not implemented on cygwin!");
#else #else
int index = 0; int index = 0;

6
src/sim/syscall_emul.hh
View file

@ -41,14 +41,16 @@
/// This file defines objects used to emulate syscalls from the target /// This file defines objects used to emulate syscalls from the target
/// application on the host machine. /// application on the host machine.
#include <errno.h>
#include <string>
#ifdef __CYGWIN32__ #ifdef __CYGWIN32__
#include <sys/fcntl.h> // for O_BINARY #include <sys/fcntl.h> // for O_BINARY
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/time.h>
#include <string>
#include "base/chunk_generator.hh" #include "base/chunk_generator.hh"
#include "base/intmath.hh" // for RoundUp #include "base/intmath.hh" // for RoundUp