diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-05-06 18:56:08 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-05-06 18:56:08 +0000 |
| commit | 7bcb34d24ee80b914b14de055ab8b0560e87e7fd (patch) | |
| tree | c7ab58ec15a0c0b487d9e60bb55fab78038723ba /user/protobuf/musl-fix.patch | |
| parent | aee6b0728a06a07700b2473cdeca06cb12fa8a81 (diff) | |
| parent | def4421a968a5b75dd87fa986956bf10dc7921ca (diff) | |
| download | packages-7bcb34d24ee80b914b14de055ab8b0560e87e7fd.tar.gz packages-7bcb34d24ee80b914b14de055ab8b0560e87e7fd.tar.bz2 packages-7bcb34d24ee80b914b14de055ab8b0560e87e7fd.tar.xz packages-7bcb34d24ee80b914b14de055ab8b0560e87e7fd.zip | |
Merge branch 'bump.djt.20190417' into 'master'
djt package bumps for 2019-05-03
See merge request !227
Diffstat (limited to 'user/protobuf/musl-fix.patch')
| -rw-r--r-- | user/protobuf/musl-fix.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/user/protobuf/musl-fix.patch b/user/protobuf/musl-fix.patch deleted file mode 100644 index 442ca20ed..000000000 --- a/user/protobuf/musl-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -seems like both musl libc and android has byteswap.h - ---- a/src/google/protobuf/stubs/port.h -+++ b/src/google/protobuf/stubs/port.h -@@ -94,7 +94,7 @@ - #include <intrin.h> - #elif defined(__APPLE__) - #include <libkern/OSByteOrder.h> --#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__) -+#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__) - #include <byteswap.h> // IWYU pragma: export - #endif - -@@ -380,7 +380,7 @@ inline void GOOGLE_UNALIGNED_STORE64(voi - #define bswap_32(x) OSSwapInt32(x) - #define bswap_64(x) OSSwapInt64(x) - --#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__) -+#elif !defined(__linux__) && !defined(__BIONIC__) && !defined(__CYGWIN__) - - static inline uint16 bswap_16(uint16 x) { - return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); |