From f2e3d7b38ce2db0901278960c65b9de9267472c0 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sun, 23 Jul 2017 21:19:07 +0200
Subject: [PATCH] Don't define functions called itoa(), because this causes
 problems on platforms that define itoa() in their libcs.

---
 lang/basic/src/basic.lex | 2 +-
 lang/basic/src/bem.h     | 2 +-
 lang/basic/src/gencode.c | 2 +-
 lang/basic/src/util.c    | 2 +-
 lang/occam/comp/em.c     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/basic/src/basic.lex b/lang/basic/src/basic.lex
index 4eb9e1659..3ee185e3f 100644
--- a/lang/basic/src/basic.lex
+++ b/lang/basic/src/basic.lex
@@ -522,7 +522,7 @@ scanstring()
 		yylval.integer= genemlabel();
 		C_rom_dlb((label)i,(arith)0);
 		C_rom_icon("9999",(arith)BEMINTSIZE);
-		C_rom_icon(itoa(length),(arith)BEMINTSIZE);
+		C_rom_icon(myitoa(length),(arith)BEMINTSIZE);
 	}
 #ifdef YYDEBUG
 	if (yydebug) print("STRVALUE found\n");
diff --git a/lang/basic/src/bem.h b/lang/basic/src/bem.h
index deb6eb435..d49523cd4 100644
--- a/lang/basic/src/bem.h
+++ b/lang/basic/src/bem.h
@@ -71,7 +71,7 @@ extern int 	dataused;
 extern Linerecord *currline;
 
 
-extern char *itoa();
+extern char *myitoa();
 extern char *salloc();
 
 extern char *strcpy();
diff --git a/lang/basic/src/gencode.c b/lang/basic/src/gencode.c
index 8fb611dc0..710de169d 100644
--- a/lang/basic/src/gencode.c
+++ b/lang/basic/src/gencode.c
@@ -670,7 +670,7 @@ gendata()
 	C_df_dnam("datfdes");
 	C_rom_dnam("datfname",(arith)0);
 	C_rom_cst((arith)1);
-	C_rom_cst((arith)(itoa(strlen(datfname))));
+	C_rom_cst((arith)(myitoa(strlen(datfname))));
 	C_df_dnam("dattdes");
 	C_rom_dnam("dattyp",(arith)0);
 	C_rom_cst((arith)1);
diff --git a/lang/basic/src/util.c b/lang/basic/src/util.c
index ff98cf82b..a85339bc5 100644
--- a/lang/basic/src/util.c
+++ b/lang/basic/src/util.c
@@ -69,7 +69,7 @@ illegalcmd()
 
 
 
-char *itoa(i)
+char *myitoa(i)
 int i;
 {
 	static char buf[30];
diff --git a/lang/occam/comp/em.c b/lang/occam/comp/em.c
index ecd779824..605817371 100644
--- a/lang/occam/comp/em.c
+++ b/lang/occam/comp/em.c
@@ -355,7 +355,7 @@ void zgt(lab) int lab;		{	C_zgt((label) lab); }
 void zlt(lab) int lab;		{	C_zlt((label) lab); }
 void zne(lab) int lab;		{	C_zne((label) lab); }
 
-char *itoa(i) long i;
+char *myitoa(i) long i;
 {
 	static char a[sizeof(long)*3];
 	sprint(a, "%ld", i);
@@ -364,7 +364,7 @@ char *itoa(i) long i;
 
 void rom(size, c) int size; long c;
 {
-	C_rom_icon(itoa(c), (arith) size);
+	C_rom_icon(myitoa(c), (arith) size);
 }
 
 void lin()
-- 
2.34.1