diff options
| author | maya <maya> | 2016-10-04 23:16:44 +0000 |
|---|---|---|
| committer | maya <maya> | 2016-10-04 23:16:44 +0000 |
| commit | c5514377bb264e8ee7ae30eb98f55c1d26a5f3ef (patch) | |
| tree | fd2ac4134b1758f14000b7554d45af817037de80 /devel | |
| parent | ca0d006a35b75e8415f0624be66ac52d42d18393 (diff) | |
| download | pkgsrc-c5514377bb264e8ee7ae30eb98f55c1d26a5f3ef.tar.gz | |
churn for readability.
if not true -> if true.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/protobuf/distinfo | 4 | ||||
| -rw-r--r-- | devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo index 99ae4f3dbeb..8549929134d 100644 --- a/devel/protobuf/distinfo +++ b/devel/protobuf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2016/10/04 11:48:16 maya Exp $ +$NetBSD: distinfo,v 1.10 2016/10/04 23:16:44 maya Exp $ SHA1 (protobuf-cpp-3.0.0.tar.gz) = 00140d255922bf33ef3842168954e3269fbba3af RMD160 (protobuf-cpp-3.0.0.tar.gz) = 01a00093e0f7297b3fb7933ef5700d2753109c95 @@ -6,5 +6,5 @@ SHA512 (protobuf-cpp-3.0.0.tar.gz) = 72491ab54244b82f69f39bc485336d986d7238cdf62 Size (protobuf-cpp-3.0.0.tar.gz) = 4075839 bytes SHA1 (patch-gmock_configure) = 49a4c9301ad4c1973ee7058213df50a7833161f0 SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113 -SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 0427f23c3818f637d2ef4f54079a60f8a2f599a0 +SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 9ec851134da674980a49302e9582a432a47f7974 SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 93cf8135660e945044e5a560a3010e32e660ae6f diff --git a/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h b/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h index 9a2590ad5ef..d9eb31785a8 100644 --- a/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h +++ b/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h @@ -1,4 +1,4 @@ -$NetBSD: patch-src_google_protobuf_stubs_atomicops.h,v 1.4 2016/10/04 11:48:16 maya Exp $ +$NetBSD: patch-src_google_protobuf_stubs_atomicops.h,v 1.5 2016/10/04 23:16:44 maya Exp $ NetBSD arm and mips uses long for intptr_t, which fails -fpermissive checks. So explicitly use int32 here instead. @@ -9,10 +9,10 @@ So explicitly use int32 here instead. // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. -+#ifndef _LP64 -+typedef Atomic32 AtomicWord; -+#else ++#ifdef _LP64 typedef intptr_t AtomicWord; ++#else ++typedef Atomic32 AtomicWord; +#endif // Atomically execute: |