Skip to content

O
opencv
Unverified Commit aa55cdb7 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub
Browse files
Options

Merge pull request #10622 from alalek:fix_build_js 

Re-apply protobuf fix for JavaScript builds
parents a55aed5f ec8d39d0
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
3rdparty/protobuf/src/google/protobuf/stubs/port.h
View file @ aa55cdb7
...@@ -239,8 +239,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); ...@@ -239,8 +239,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
#if defined(__clang__) && defined(__has_cpp_attribute) \ #if defined(__clang__) && defined(__has_cpp_attribute) \
&& !defined(GOOGLE_PROTOBUF_OS_APPLE) && !defined(GOOGLE_PROTOBUF_OS_APPLE)
# if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN) || \ # if defined(GOOGLE_PROTOBUF_OS_NACL) || __has_cpp_attribute(clang::fallthrough)
__has_cpp_attribute(clang::fallthrough)
# define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]] # define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
# endif # endif
#elif defined(__GNUC__) && __GNUC__ > 6 #elif defined(__GNUC__) && __GNUC__ > 6
......
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