Glog: Workaround mess around windows and non-windows headers
Seems we can not use include directories order trick, since files are included form inside ".." string, which forces current directory to be checked first.
This commit is contained in:
parent
9f45f1a6b7
commit
c9e7e1987b
|
@ -33,6 +33,11 @@
|
|||
// Pretty much everybody needs to #include this file so that they can
|
||||
// log various happenings.
|
||||
//
|
||||
|
||||
#ifdef WIN32
|
||||
# include "windows/glog/logging.h"
|
||||
#else // WIN32
|
||||
|
||||
#ifndef _LOGGING_H_
|
||||
#define _LOGGING_H_
|
||||
|
||||
|
@ -1623,3 +1628,5 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
|
|||
}
|
||||
|
||||
#endif // _LOGGING_H_
|
||||
|
||||
#endif // WIN32
|
||||
|
|
|
@ -33,6 +33,10 @@
|
|||
// acquire any locks, and can therefore be used by low-level memory
|
||||
// allocation and synchronization code.
|
||||
|
||||
#ifdef WIN32
|
||||
# include "windows/glog/raw_logging.h"
|
||||
#else // WIN32
|
||||
|
||||
#ifndef BASE_RAW_LOGGING_H_
|
||||
#define BASE_RAW_LOGGING_H_
|
||||
|
||||
|
@ -183,3 +187,5 @@ GOOGLE_GLOG_DLL_DECL void RawLog__SetLastTime(const struct tm& t, int usecs);
|
|||
}
|
||||
|
||||
#endif // BASE_RAW_LOGGING_H_
|
||||
|
||||
#endif // WIN32
|
||||
|
|
|
@ -44,6 +44,10 @@
|
|||
// - GLOG_STL_LOGGING_FOR_EXT_SLIST - <ext/slist>
|
||||
//
|
||||
|
||||
#ifdef WIN32
|
||||
# include "windows/glog/stl_logging.h"
|
||||
#else // WIN32
|
||||
|
||||
#ifndef UTIL_GTL_STL_LOGGING_INL_H_
|
||||
#define UTIL_GTL_STL_LOGGING_INL_H_
|
||||
|
||||
|
@ -218,3 +222,5 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) {
|
|||
namespace std { using ::operator<<; }
|
||||
|
||||
#endif // UTIL_GTL_STL_LOGGING_INL_H_
|
||||
|
||||
#endif // WIN32
|
||||
|
|
Loading…
Reference in New Issue