summaryrefslogtreecommitdiff
path: root/math/R
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-01-23 15:06:44 +0000
committerjoerg <joerg@pkgsrc.org>2015-01-23 15:06:44 +0000
commit5afa6fe45bfe35f04ec9392978fb4d33df40b443 (patch)
tree0badda28ee2b894dc23d6b1c0229689d4127b3e0 /math/R
parentcc2f107ce97f150496665b3ec0501e6adef5597b (diff)
downloadpkgsrc-5afa6fe45bfe35f04ec9392978fb4d33df40b443.tar.gz
Rename local strtoi function.
Diffstat (limited to 'math/R')
-rw-r--r--math/R/distinfo3
-rw-r--r--math/R/patches/patch-src_main_character.c22
2 files changed, 24 insertions, 1 deletions
diff --git a/math/R/distinfo b/math/R/distinfo
index 082af237918..a4d3451ae08 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -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 @@ Size (R-3.1.1.tar.gz) = 28606569 bytes
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 --git a/math/R/patches/patch-src_main_character.c b/math/R/patches/patch-src_main_character.c
new file mode 100644
index 00000000000..e485cceb29d
--- /dev/null
+++ b/math/R/patches/patch-src_main_character.c
@@ -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;