[pkgsrc/trunk]: pkgsrc/math/R Rename local strtoi function.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f81de06a4294
branches:  trunk
changeset: 645117:f81de06a4294
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 23 15:06:44 2015 +0000

description:
Rename local strtoi function.

diffstat:

 math/R/distinfo                           |   3 ++-
 math/R/patches/patch-src_main_character.c |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r 7d37c3d1f46a -r f81de06a4294 math/R/distinfo
--- a/math/R/distinfo   Fri Jan 23 15:06:00 2015 +0000
+++ b/math/R/distinfo   Fri Jan 23 15:06:44 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2014/11/29 22:04:51 joerg Exp $
+$NetBSD: distinfo,v 1.63 2015/01/23 15:06:44 joerg Exp $
 
 SHA1 (R-3.1.1.tar.gz) = e974ecc92e49266529e8e791e02a80c75e50b696
 RMD160 (R-3.1.1.tar.gz) = 72e5d7a9ec4dc9c960321e7fc8d939cb59d63c31
@@ -6,3 +6,4 @@
 SHA1 (patch-ac) = 9c6de78be36766ceefa8aafa8a7b5d5af3f83cac
 SHA1 (patch-ad) = b40536fac079e2cc348a020fafac687f2f8b1dfe
 SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8
+SHA1 (patch-src_main_character.c) = 29d302b4530bdc3b49afff6b10f94277e1a94b43
diff -r 7d37c3d1f46a -r f81de06a4294 math/R/patches/patch-src_main_character.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/R/patches/patch-src_main_character.c Fri Jan 23 15:06:44 2015 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_main_character.c,v 1.1 2015/01/23 15:06:44 joerg Exp $
+
+--- src/main/character.c.orig  2015-01-22 19:20:05.000000000 +0000
++++ src/main/character.c
+@@ -1311,7 +1311,7 @@ SEXP attribute_hidden do_strtrim(SEXP ca
+     return s;
+ }
+ 
+-static int strtoi(SEXP s, int base)
++static int my_strtoi(SEXP s, int base)
+ {
+     long int res;
+     char *endp;
+@@ -1345,7 +1345,7 @@ SEXP attribute_hidden do_strtoi(SEXP cal
+ 
+     PROTECT(ans = allocVector(INTSXP, n = LENGTH(x)));
+     for(i = 0; i < n; i++)
+-      INTEGER(ans)[i] = strtoi(STRING_ELT(x, i), base);
++      INTEGER(ans)[i] = my_strtoi(STRING_ELT(x, i), base);
+     UNPROTECT(1);
+     
+     return ans;