Use byteswap.h when building against musl libc (#8503)

protocolbuffers · Apr 19, 2021 · e6db597 · e6db597
1 parent 0f25590
commit e6db597
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 118 deletions.
diff --git a/python/google/protobuf/internal/python_protobuf.cc b/python/google/protobuf/internal/python_protobuf.cc
diff --git a/python/google/protobuf/python_protobuf.h b/python/google/protobuf/python_protobuf.h
diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h
@@ -78,7 +78,7 @@
 #include <intrin.h>
 #elif defined(__APPLE__)
 #include <libkern/OSByteOrder.h>
-#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
+#elif defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
 #include <byteswap.h>  // IWYU pragma: export
 #endif
 
@@ -242,7 +242,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) {
 #define bswap_32(x) OSSwapInt32(x)
 #define bswap_64(x) OSSwapInt64(x)
 
-#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
+#elif !defined(__linux__) && !defined(__ANDROID__) && !defined(__CYGWIN__)
 
 #ifndef bswap_16
 static inline uint16 bswap_16(uint16 x) {