diff options
Diffstat (limited to 'extern/glog')
-rw-r--r-- | extern/glog/CMakeLists.txt | 14 | ||||
-rw-r--r-- | extern/glog/README.blender | 2 | ||||
-rw-r--r-- | extern/glog/include/glog/log_severity.h (renamed from extern/glog/src/glog/log_severity.h) | 0 | ||||
-rw-r--r-- | extern/glog/include/glog/logging.h (renamed from extern/glog/src/glog/logging.h) | 7 | ||||
-rw-r--r-- | extern/glog/include/glog/raw_logging.h (renamed from extern/glog/src/glog/raw_logging.h) | 6 | ||||
-rw-r--r-- | extern/glog/include/glog/stl_logging.h (renamed from extern/glog/src/glog/stl_logging.h) | 6 | ||||
-rw-r--r-- | extern/glog/include/glog/vlog_is_on.h (renamed from extern/glog/src/glog/vlog_is_on.h) | 0 | ||||
-rw-r--r-- | extern/glog/src/windows/glog/logging.h | 2 |
8 files changed, 10 insertions, 27 deletions
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index 59833151e4e..df64718ee95 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -23,6 +23,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC + src ../gflags/src ) @@ -70,24 +71,23 @@ if(WIN32) list(APPEND INC src/windows - src ) else() list(APPEND INC - src + include ) - list(APPEND SRC src/demangle.cc src/signalhandler.cc src/symbolize.cc src/demangle.h - src/glog/logging.h - src/glog/log_severity.h - src/glog/raw_logging.h - src/glog/vlog_is_on.h src/symbolize.h + + include/glog/logging.h + include/glog/log_severity.h + include/glog/raw_logging.h + include/glog/vlog_is_on.h ) endif() diff --git a/extern/glog/README.blender b/extern/glog/README.blender index c48bc468e4c..38d5ff05c86 100644 --- a/extern/glog/README.blender +++ b/extern/glog/README.blender @@ -5,3 +5,5 @@ Upstream version: 0.3.5, a6a166db069 Local modifications: * Added per-platform config.h files so no configuration-time checks for functions and so are needed. +* Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS + in Windows' specific config.h. diff --git a/extern/glog/src/glog/log_severity.h b/extern/glog/include/glog/log_severity.h index 99945a426da..99945a426da 100644 --- a/extern/glog/src/glog/log_severity.h +++ b/extern/glog/include/glog/log_severity.h diff --git a/extern/glog/src/glog/logging.h b/extern/glog/include/glog/logging.h index 7aac880a952..8238ca9610f 100644 --- a/extern/glog/src/glog/logging.h +++ b/extern/glog/include/glog/logging.h @@ -33,11 +33,6 @@ // 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_ @@ -1628,5 +1623,3 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter( } #endif // _LOGGING_H_ - -#endif // WIN32 diff --git a/extern/glog/src/glog/raw_logging.h b/extern/glog/include/glog/raw_logging.h index b030f7f736d..65278f62803 100644 --- a/extern/glog/src/glog/raw_logging.h +++ b/extern/glog/include/glog/raw_logging.h @@ -33,10 +33,6 @@ // 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_ @@ -187,5 +183,3 @@ GOOGLE_GLOG_DLL_DECL void RawLog__SetLastTime(const struct tm& t, int usecs); } #endif // BASE_RAW_LOGGING_H_ - -#endif // WIN32 diff --git a/extern/glog/src/glog/stl_logging.h b/extern/glog/include/glog/stl_logging.h index bd000152738..40a15aa4578 100644 --- a/extern/glog/src/glog/stl_logging.h +++ b/extern/glog/include/glog/stl_logging.h @@ -44,10 +44,6 @@ // - 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_ @@ -222,5 +218,3 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { namespace std { using ::operator<<; } #endif // UTIL_GTL_STL_LOGGING_INL_H_ - -#endif // WIN32 diff --git a/extern/glog/src/glog/vlog_is_on.h b/extern/glog/include/glog/vlog_is_on.h index 02b0b867097..02b0b867097 100644 --- a/extern/glog/src/glog/vlog_is_on.h +++ b/extern/glog/include/glog/vlog_is_on.h diff --git a/extern/glog/src/windows/glog/logging.h b/extern/glog/src/windows/glog/logging.h index 606831f211c..f521a2b9424 100644 --- a/extern/glog/src/windows/glog/logging.h +++ b/extern/glog/src/windows/glog/logging.h @@ -86,7 +86,7 @@ #include <inttypes.h> // a third place for uint16_t or u_int16_t #endif -#if 1 +#if 0 #include <gflags/gflags.h> #endif |