Merge pull request #10622 from alalek:fix_build_js

Re-apply protobuf fix for JavaScript builds

Merge pull request #10622 from alalek:fix_build_js
Re-apply protobuf fix for JavaScript builds
aa55cdb7 · Alexander Alekhin · GitHub · a55aed5f · ec8d39d0 · aa55cdb7
Unverified Commit aa55cdb7 authored Jan 17, 2018 by Alexander Alekhin Committed by GitHub Jan 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

port.h 3rdparty/protobuf/src/google/protobuf/stubs/port.h +1 -2

No files found.
--- a/3rdparty/protobuf/src/google/protobuf/stubs/port.h
+++ b/3rdparty/protobuf/src/google/protobuf/stubs/port.h
@@ -239,8 +239,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);

 #if defined(__clang__) && defined(__has_cpp_attribute) \
    && !defined(GOOGLE_PROTOBUF_OS_APPLE)
-# if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN) || \
-     __has_cpp_attribute(clang::fallthrough)
+# if defined(GOOGLE_PROTOBUF_OS_NACL) || __has_cpp_attribute(clang::fallthrough)
 #  define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
 # endif
 #elif defined(__GNUC__) && __GNUC__ > 6