Don't call local function strtoi.

4 files changed, 50 insertions, 4 deletions

diff --git a/lang/baci/distinfo b/lang/baci/distinfo
index 34df082b3b9..d8c529b4395 100644
--- a/lang/baci/distinfo
+++ b/lang/baci/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/08/01 20:40:42 joerg Exp $
+$NetBSD: distinfo,v 1.8 2015/01/25 13:12:54 joerg Exp $
 
 SHA1 (bacisrc.tar.gz) = 3b655bcbd2823047f3f92e6f2d3d12bc7eaa772d
 RMD160 (bacisrc.tar.gz) = c484e3c05734cac1dd394d9b09b256e2a2626897
@@ -11,7 +11,7 @@ SHA1 (patch-ab) = 26c8235aff9ab50013ae06f5f6256bfb3f26db83
 SHA1 (patch-ac) = f72a2a911b2c1d262b6767a72a223397daf00c7a
 SHA1 (patch-ad) = 70b1a6e08245d2c2769fa07532943e5fcecf1fc3
 SHA1 (patch-ae) = a2be64d957abd66dac0057b896af1326c89f71af
-SHA1 (patch-af) = 9317e315edace5580b714d82f88bd3360e4c4cd9
+SHA1 (patch-af) = 2e7dfeb32cc405770905cec57155f6bbfea621c9
 SHA1 (patch-ag) = df83bd959b26677d193b883cc0d3a944c6d86544
 SHA1 (patch-ah) = 500a536f362eba6fdd152e5be598d66528b3396d
 SHA1 (patch-ai) = a94b97a695bfcf233835cec67791c99732c7cdf6
@@ -19,3 +19,5 @@ SHA1 (patch-aj) = 0c9824049ac9555b76889fcd09e644e91ebae78d
 SHA1 (patch-ak) = 099f329662611a94e2bc2cce3f30753d3e053680
 SHA1 (patch-al) = 06509333c305b150e1d1215454ff153f95cb6e2c
 SHA1 (patch-am) = 79eb900505f6130033c820a5ed46f386ab14bf54
+SHA1 (patch-include_computil.h) = 28c872e5f7cb850dec3cba69b513f00083e8e07f
+SHA1 (patch-lib_computil.c) = 53f314d5d3ab3d3db52a17757b96d8a9913dcd16
diff --git a/lang/baci/patches/patch-af b/lang/baci/patches/patch-af
index a41f1ad8d9f..96ca292f542 100644
--- a/lang/baci/patches/patch-af
+++ b/lang/baci/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/02/19 15:40:54 wiz Exp $
+$NetBSD: patch-af,v 1.3 2015/01/25 13:12:54 joerg Exp $
 
---- ccomp/bac.y.orig	1999-08-31 18:19:03.000000000 +0200
+--- ccomp/bac.y.orig	1999-08-31 16:19:03.000000000 +0000
 +++ ccomp/bac.y
 @@ -3,6 +3,7 @@
         /* based on the grammar for the BenAri Concurrent Pascal compiler */
@@ -20,6 +20,15 @@ $NetBSD: patch-af,v 1.2 2005/02/19 15:40:54 wiz Exp $
  extern   void yyerror(char*); 
  extern   int yylex(void); 
  
+@@ -799,7 +797,7 @@ unsigned_const  :  unsigned_num
+       ;
+ 
+ unsigned_num  :  UNSIGNED_INT   /* no reals */
+-         { $$ = strtoi(numbertext,numberbase); }
++         { $$ = my_strtoi(numbertext,numberbase); }
+       ;
+ 
+ extern_decl  :  extern_func_decl
 @@ -1013,6 +1011,7 @@ then_stmt  :  stmt
  
  the_else  :  ELSE
diff --git a/lang/baci/patches/patch-include_computil.h b/lang/baci/patches/patch-include_computil.h
new file mode 100644
index 00000000000..5977d6f041b
--- /dev/null
+++ b/lang/baci/patches/patch-include_computil.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_computil.h,v 1.1 2015/01/25 13:12:54 joerg Exp $
+
+--- include/computil.h.orig	2015-01-24 16:18:49.000000000 +0000
++++ include/computil.h
+@@ -114,7 +114,7 @@ extern void stdproc_pcode(int px, int pc
+ extern TYPES resulttype(TYPES a, TYPES b);
+    /* used for checking the result type of a binary operator */
+ 
+-extern unsigned int strtoi(char *str, int base);
++extern unsigned int my_strtoi(char *str, int base);
+ /*
+    interprets 'str' string as an unsigned integer in the base 'base'
+    for 'base' == 2, 8, 10, or 16
diff --git a/lang/baci/patches/patch-lib_computil.c b/lang/baci/patches/patch-lib_computil.c
new file mode 100644
index 00000000000..30467a9e73e
--- /dev/null
+++ b/lang/baci/patches/patch-lib_computil.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_computil.c,v 1.1 2015/01/25 13:12:54 joerg Exp $
+
+--- lib/computil.c.orig	2015-01-24 16:18:51.000000000 +0000
++++ lib/computil.c
+@@ -614,7 +614,7 @@ TYPES resulttype(TYPES a, TYPES b)
+    return(ints);
+ }  /* resulttype */
+ 
+-unsigned int strtoi(char *str, int base)
++unsigned int my_strtoi(char *str, int base)
+ /* 
+    interprets 'str' string as an unsigned integer in the base 'base'
+    for 'base' == 2, 8, 10, or 16
+@@ -678,7 +678,7 @@ unsigned int tmp=0;
+       break;
+    }  /* switch */
+    return (tmp);
+-}  /*end of strtoi */
++}  /*end of my_strtoi */
+ 
+ 
+ int store_string(char * str, int* sx)