diff options
| author | TBK <tbk@jjtc.dk> | 2017-12-01 02:17:43 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-12-14 13:31:20 +0000 |
| commit | 10220e1b836e96b1c50f3692ee61204b47939c8b (patch) | |
| tree | 28cd597477920dd9317784752460905de1b6f12e /main/protobuf/musl-fix.patch | |
| parent | 160eff4125d01b39391dd1724a40a8323f47c6aa (diff) | |
| download | aports-10220e1b836e96b1c50f3692ee61204b47939c8b.tar.bz2 aports-10220e1b836e96b1c50f3692ee61204b47939c8b.tar.xz | |
main/protobuf: upgrade to 3.5.0
Diffstat (limited to 'main/protobuf/musl-fix.patch')
| -rw-r--r-- | main/protobuf/musl-fix.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/protobuf/musl-fix.patch b/main/protobuf/musl-fix.patch index d7ab194a93..d53ee43698 100644 --- a/main/protobuf/musl-fix.patch +++ b/main/protobuf/musl-fix.patch @@ -1,10 +1,9 @@ seems like both musl libc and android has byteswap.h diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h -index 376be5f..21223f4 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h -@@ -87,7 +87,7 @@ +@@ -93,7 +93,7 @@ #include <stdlib.h> // NOLINT(build/include) #elif defined(__APPLE__) #include <libkern/OSByteOrder.h> @@ -13,7 +12,7 @@ index 376be5f..21223f4 100644 #include <byteswap.h> // IWYU pragma: export #endif -@@ -299,7 +299,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) { +@@ -366,7 +366,7 @@ #define bswap_32(x) OSSwapInt32(x) #define bswap_64(x) OSSwapInt64(x) |