From: dtrg <none@none>
Date: Tue, 18 Jul 2006 16:57:51 +0000 (+0000)
Subject: Renamed the private 'atol()' function to 'our_atol()' to avoid clashes with the libc... 
X-Git-Tag: release-6-0-pre-1~141
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=2aca7fbaf44c1be832b46a5f467142beb957b09a;p=ack.git

Renamed the private 'atol()' function to 'our_atol()' to avoid clashes with the libc one.
---

diff --git a/mach/proto/cg/fillem.c b/mach/proto/cg/fillem.c
index 8388c021a..23c15c66f 100644
--- a/mach/proto/cg/fillem.c
+++ b/mach/proto/cg/fillem.c
@@ -2,7 +2,9 @@
 static char rcsid2[] = "$Id$";
 #endif
 
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "assert.h"
 #include <em_spec.h>
 #include <em_pseu.h>
@@ -87,7 +89,7 @@ extern double atof();
 /* Own version of atol that continues computing on overflow.
    We don't know that about the ANSI C one.
 */
-long atol(s)
+long our_atol(s)
 register char *s;
 {
   register long total = 0;
@@ -616,7 +618,7 @@ long con(t) {
 			part_flush();
 			con_mult((word)argval);
 		} else {
-			con_part((int)argval,(word)atol(str));
+			con_part((int)argval,(word)our_atol(str));
 		}
 		return(argval);
 	case sp_fcon:
diff --git a/mach/proto/ncg/fillem.c b/mach/proto/ncg/fillem.c
index 112656831..76af4417f 100644
--- a/mach/proto/ncg/fillem.c
+++ b/mach/proto/ncg/fillem.c
@@ -2,7 +2,9 @@
 static char rcsid2[] = "$Id$";
 #endif
 
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "assert.h"
 #include <em_spec.h>
 #include <em_pseu.h>
@@ -85,7 +87,7 @@ extern double atof();
 /* Own version of atol that continues computing on overflow.
    We don't know that about the ANSI C one.
 */
-long atol(s)
+long our_atol(s)
 register char *s;
 {
   register long total = 0;
@@ -657,7 +659,7 @@ long con(t) {
 			part_flush();
 			con_mult((word)argval);
 		} else {
-			con_part((int)argval,(word)atol(str));
+			con_part((int)argval,(word)our_atol(str));
 		}
 		return(argval);
 	case sp_fcon: