Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix MinGW-w64 build issues. #8286

Merged
merged 2 commits into from Feb 12, 2021
Merged

Fix MinGW-w64 build issues. #8286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced03bf
Update coded_stream.h
brechtsanders Feb 11, 2021
ee43c78
Update port_def.inc
brechtsanders Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/google/protobuf/io/coded_stream.h
View file
Open in desktop
Expand Up @@ -120,12 +120,12 @@
#include <type_traits>
#include <utility>

#ifdef _MSC_VER
#ifdef _WIN32
// Assuming windows is always little-endian.
#if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
#define PROTOBUF_LITTLE_ENDIAN 1
#endif
#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
// If MSVC has "/RTCc" set, it will complain about truncating casts at
// runtime. This file contains some intentional truncating casts.
#pragma runtime_checks("c", off)
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/port_def.inc
View file
Open in desktop
Expand Up @@ -615,7 +615,7 @@
#define PROTOBUF_PRAGMA_INIT_SEG
#endif

#if defined(__has_attribute)
#if defined(__has_attribute) && !defined(__MINGW32__)
#if __has_attribute(weak)
#define PROTOBUF_ATTRIBUTE_WEAK __attribute__((weak))
#endif
Expand Down