pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/digest/files Fix build on Tribblix without in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/794eea8b3e24
branches:  trunk
changeset: 387018:794eea8b3e24
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Nov 07 00:39:07 2018 +0000

description:
Fix build on Tribblix without introducing warnings on NetBSD. From
riastradh@ ("commit!") with help from maya@.

diffstat:

 pkgtools/digest/files/blake2b.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 81574d5111b8 -r 794eea8b3e24 pkgtools/digest/files/blake2b.c
--- a/pkgtools/digest/files/blake2b.c   Tue Nov 06 19:33:07 2018 +0000
+++ b/pkgtools/digest/files/blake2b.c   Wed Nov 07 00:39:07 2018 +0000
@@ -24,8 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#define        _POSIX_C_SOURCE 200809L
-
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
@@ -34,7 +32,7 @@
 
 void *(*volatile blake2b_explicit_memset_impl)(void *, int, size_t) = &memset;
 static void *
-explicit_memset(void *buf, int c, size_t n)
+blake2b_explicit_memset(void *buf, int c, size_t n)
 {
 
        return (*blake2b_explicit_memset_impl)(buf, c, n);
@@ -169,7 +167,7 @@
        h[6] ^= v6 ^ v14;
        h[7] ^= v7 ^ v15;
 
-       (void)explicit_memset(m, 0, sizeof m);
+       (void)blake2b_explicit_memset(m, 0, sizeof m);
 }
 
 void
@@ -281,7 +279,7 @@
        }
 
        /* Erase the state.  */
-       (void)explicit_memset(B, 0, sizeof B);
+       (void)blake2b_explicit_memset(B, 0, sizeof B);
 }
 
 void



Home | Main Index | Thread Index | Old Index