summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2012-03-29 14:51:59 +0000
committerwiz <wiz@pkgsrc.org>2012-03-29 14:51:59 +0000
commita268f04e82c4d16f84914c69ea356f3f36bfbcf1 (patch)
treea9c2e0910797a87ee3966c60dce2eabb7d0e42c7 /sysutils
parentdac93d94a203e0a393343b216c29d8e20906781e (diff)
downloadpkgsrc-a268f04e82c4d16f84914c69ea356f3f36bfbcf1.tar.gz
Move ifdef around so it matches the code.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/cdrtools/distinfo4
-rw-r--r--sysutils/cdrtools/patches/patch-include_schily_sha2.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 6ab89d94308..7ee8cea7ec0 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.64 2012/03/29 13:22:06 wiz Exp $
+$NetBSD: distinfo,v 1.65 2012/03/29 14:51:59 wiz Exp $
SHA1 (cdrtools-3.01a07.tar.bz2) = ee4b540e4897ee6637837a097658305d18345999
RMD160 (cdrtools-3.01a07.tar.bz2) = b8331d826bf64de8bd26c041624a3e41648b6952
Size (cdrtools-3.01a07.tar.bz2) = 2043525 bytes
-SHA1 (patch-include_schily_sha2.h) = 0d9c063b7ebdbdf5cc15d7dda3d80ddb97348013
+SHA1 (patch-include_schily_sha2.h) = dab2dd40b20a37f1f2ff8cbd64f8361e800e1753
diff --git a/sysutils/cdrtools/patches/patch-include_schily_sha2.h b/sysutils/cdrtools/patches/patch-include_schily_sha2.h
index c4196292249..e297ddef260 100644
--- a/sysutils/cdrtools/patches/patch-include_schily_sha2.h
+++ b/sysutils/cdrtools/patches/patch-include_schily_sha2.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_schily_sha2.h,v 1.1 2012/03/29 13:22:07 wiz Exp $
+$NetBSD: patch-include_schily_sha2.h,v 1.2 2012/03/29 14:51:59 wiz Exp $
Fix clang-3.1 build:
sha2.c:1001:2: error: call to 'SHA384Pad' is ambiguous
@@ -14,16 +14,16 @@ sha2.c:969:14: note: candidate function
--- include/schily/sha2.h.orig 2010-08-27 10:41:30.000000000 +0000
+++ include/schily/sha2.h
-@@ -106,10 +106,12 @@ extern char *SHA256Data __PR((const UIn
+@@ -104,10 +104,12 @@ extern char *SHA256Data __PR((const UIn
+
+ #ifdef HAVE_LONGLONG
extern void SHA384Init __PR((SHA2_CTX *));
++#ifndef HAVE_PRAGMA_WEAK
extern void SHA384Transform __PR((UInt64_t state[8],
const UInt8_t [SHA384_BLOCK_LENGTH]));
-+#ifndef HAVE_PRAGMA_WEAK
extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t));
extern void SHA384Pad __PR((SHA2_CTX *));
++#endif
extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH],
SHA2_CTX *));
-+#endif
extern char *SHA384End __PR((SHA2_CTX *, char *));
- extern char *SHA384File __PR((const char *, char *));
- extern char *SHA384FileChunk __PR((const char *, char *, off_t, off_t));