diff options
| author | hasso <hasso@pkgsrc.org> | 2009-05-13 14:26:24 +0000 |
|---|---|---|
| committer | hasso <hasso@pkgsrc.org> | 2009-05-13 14:26:24 +0000 |
| commit | 03b228776d5e05360e33ca8b70147ee21217b4fc (patch) | |
| tree | bce1bb273712578343478a6a1736c950f1c6cac1 /archivers/arj | |
| parent | e3dc5ef39858769dfee7c9d27686a9fdcb5d584d (diff) | |
| download | pkgsrc-03b228776d5e05360e33ca8b70147ee21217b4fc.tar.gz | |
Rename strnlen -> _strnlen to avoid conflict in systems having strnlen.
Diffstat (limited to 'archivers/arj')
| -rw-r--r-- | archivers/arj/distinfo | 4 | ||||
| -rw-r--r-- | archivers/arj/patches/patch-af | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo index 2a8bddc46f5..48e6bd2ff65 100644 --- a/archivers/arj/distinfo +++ b/archivers/arj/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2008/06/21 20:24:08 joerg Exp $ +$NetBSD: distinfo,v 1.14 2009/05/13 14:26:24 hasso Exp $ SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153 @@ -8,5 +8,5 @@ SHA1 (patch-ab) = da21aae85f1bf4b9c8cac78d45ad33c44fcd5d3d SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4 SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de -SHA1 (patch-af) = 66793484466fa8c7f0ad5cd0010ef8672b2305f4 +SHA1 (patch-af) = c4e5a0dc8a2b42af471fd065ab28f162d94bd0b7 SHA1 (patch-ag) = ce4d0fefed6ccf7ab7fad864a7cb7faa36e4e4ac diff --git a/archivers/arj/patches/patch-af b/archivers/arj/patches/patch-af index 93d79efb17b..d1d33f5605b 100644 --- a/archivers/arj/patches/patch-af +++ b/archivers/arj/patches/patch-af @@ -1,7 +1,25 @@ -$NetBSD: patch-af,v 1.1 2005/10/07 16:52:06 joerg Exp $ +$NetBSD: patch-af,v 1.2 2009/05/13 14:26:24 hasso Exp $ ---- fardata.c.orig 2005-07-22 13:27:50.000000000 +0000 -+++ fardata.c +--- fardata.c.orig 2004-04-17 14:39:42 +0300 ++++ fardata.c 2009-05-03 08:53:46 +0300 +@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, .. + + /* Length-limited strlen() */ + +-static int strnlen(const char FAR *s, int count) ++static int _strnlen(const char FAR *s, int count) + { + const char FAR *sc; + +@@ -569,7 +569,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li + if(!s) + s="(null)"; + #endif +- len=strnlen(s, precision); ++ len=_strnlen(s, precision); + if(!(flags&LEFT)) + { + while(len<field_width--) @@ -655,7 +655,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li num=va_arg(args, unsigned long); else if(qualifier=='h') |