diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-01-09 15:54:44 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-01-09 15:54:44 +0000 |
commit | 6ce17ab4b783ea0b81a49ba014bd1e3630c26cba (patch) | |
tree | c05d64dbcfcb1c7cb994ff2126b23a4cc7ce8351 /archivers/unalz | |
parent | b7043bde483cab3d7422b895c59d6f6be4d0539e (diff) | |
download | pkgsrc-6ce17ab4b783ea0b81a49ba014bd1e3630c26cba.tar.gz |
Avoid existing ERR macros. Fixes SunOS.
Diffstat (limited to 'archivers/unalz')
-rw-r--r-- | archivers/unalz/distinfo | 4 | ||||
-rw-r--r-- | archivers/unalz/patches/patch-UnAlz.h | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/archivers/unalz/distinfo b/archivers/unalz/distinfo index 19d086fc24e..cb3224bbd63 100644 --- a/archivers/unalz/distinfo +++ b/archivers/unalz/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.20 2013/05/28 19:00:04 joerg Exp $ +$NetBSD: distinfo,v 1.21 2014/01/09 15:54:44 jperkin Exp $ SHA1 (unalz-0.61.tgz) = a6cab2a02b7f44957211e694b7d8d144840b2255 RMD160 (unalz-0.61.tgz) = 68cb957aeacfc8452e01637f7e0a50939d515ab6 Size (unalz-0.61.tgz) = 138152 bytes -SHA1 (patch-UnAlz.h) = c21ec95926b716adf3c6d7145a17440bbb1e81ad +SHA1 (patch-UnAlz.h) = ecd2cb74b6d9fc53caa79a20ff0f930dfc00712d SHA1 (patch-aa) = 327fd080040946fe7a0707698f90d7709a2d3c5b SHA1 (patch-ab) = 5dca0ba5d5b6b99c3b6985195e6fc52dc89fae44 SHA1 (patch-ac) = 00c6255437f4ebdf3676787ed63cc838a16476d4 diff --git a/archivers/unalz/patches/patch-UnAlz.h b/archivers/unalz/patches/patch-UnAlz.h index 8eb2b93458b..93bcf860ac7 100644 --- a/archivers/unalz/patches/patch-UnAlz.h +++ b/archivers/unalz/patches/patch-UnAlz.h @@ -1,7 +1,8 @@ -$NetBSD: patch-UnAlz.h,v 1.1 2011/03/27 08:00:57 obache Exp $ +$NetBSD: patch-UnAlz.h,v 1.2 2014/01/09 15:54:44 jperkin Exp $ * <cstring> for memset(3) and strlen(3) * <cstdlib> for free(3) +* Avoid ERR macro --- UnAlz.h.orig 2007-02-10 05:55:10.000000000 +0000 +++ UnAlz.h @@ -14,3 +15,11 @@ $NetBSD: patch-UnAlz.h,v 1.1 2011/03/27 08:00:57 obache Exp $ using namespace std;
+@@ -426,6 +428,7 @@ public : + FileList::iterator GetCurFileHeader() { return m_posCur; }; ///< ÇöÀç (SetCurrentFile() ·Î ¼¼ÆõÈ) ÆÄÀÏ Á¤º¸
+
+ public :
++#undef ERR
+ enum ERR ///< ¿¡·¯ ÄÚµå - Á¤¸® ÇÊ¿ä..
+ {
+ ERR_NOERR,
|