Commit 81142e16 authored by Brad Larson's avatar Brad Larson

Fix build when using -Werror=undef

Correct a couple places where macros were being checked when they
might not exist in some cases.

Fixes #3356.
parent 727c0dc1
......@@ -1434,7 +1434,7 @@ inline bool CodedInputStream::IsFlat() const {
} // namespace protobuf
#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
#pragma runtime_checks("c", restore)
#endif // _MSC_VER && !defined(__INTEL_COMPILER)
......
......@@ -42,7 +42,7 @@
#define GOOGLE_PROTOBUF_HAVE_HASH_SET 1
// Use C++11 unordered_{map|set} if available.
#if ((_LIBCPP_STD_VER >= 11) || \
#if ((defined(_LIBCPP_STD_VER) && _LIBCPP_STD_VER >= 11) || \
(((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \
(__GLIBCXX__ > 20090421)))
# define GOOGLE_PROTOBUF_HAS_CXX11_HASH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment