From: Date: Tue, 17 Jul 2012 10:51:15 +0000 (+0000) Subject: Don't #undef GLOG_MSVC_* X-Git-Tag: accepted/tizen/5.0/unified/20181102.024921~121 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=711fcd27dec96995dfe3e2e542d9a0e991f08bdf;p=platform%2Fupstream%2Fglog.git Don't #undef GLOG_MSVC_* They are necessary because GLOG_MSVC_* will be expanded at DCHECK git-svn-id: https://google-glog.googlecode.com/svn/trunk@115 eb4d4688-79bd-11dd-afb4-1d65580434c0 --- diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index ca886b2..b0b3240 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in @@ -1544,7 +1544,4 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter( @ac_google_end_namespace@ -#undef GLOG_MSVC_PUSH_DISABLE_WARNING -#undef GLOG_MSVC_POP_WARNING - #endif // _LOGGING_H_ diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h index cc15b15..1e01e26 100755 --- a/src/windows/glog/logging.h +++ b/src/windows/glog/logging.h @@ -1548,7 +1548,4 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter( } -#undef GLOG_MSVC_PUSH_DISABLE_WARNING -#undef GLOG_MSVC_POP_WARNING - #endif // _LOGGING_H_