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.
This commit is contained in:
parent
8b0c83008e
commit
f07ee128cc
2 changed files with 4 additions and 7 deletions
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue