a56: parameters of this strtol() differ from strtol() in stdlib.h - rename it to...

This is incorporated from the Debian version of the package.

diff --git a/a56/lex.c b/a56/lex.c
index 72864ca53f466bca08a1314ba246fa89f49737cc..2f09a345c1755057b1a5c87c6bf087853f763fc7 100644 (file)
--- a/a56/lex.c
+++ b/a56/lex.c
@@ -8,6 +8,25 @@
  *******************************************************\
 
 /*
+ * Copyright (C) 2012 Thorsten Alteholz <debian@alteholz.de>
+ *
+ * This file is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
  * Copyright (C) 1990-1998 Quinn C. Jensen
  *
  * Permission to use, copy, modify, distribute, and sell this
@@ -75,7 +94,7 @@ yylex()
        case CHEX:
                yylval.n.type = INT;
                yylval.n.seg = ANY;
-               yylval.n.val.i = strtol(tok, 0, 16);
+               yylval.n.val.i = a56_strtol(tok, 0, 16);
                RET(CHEX);
                break;
        case CDEC:

diff --git a/a56/subs.c b/a56/subs.c
index f0e0b9db928bc850f3dff80e4751dcba22c55769..5166717c4067da5ccfeecbc36750eb2cccea0847 100644 (file)
--- a/a56/subs.c
+++ b/a56/subs.c
@@ -9,6 +9,7 @@
 
 /*
  * Copyright (C) 2008 Robert Millan <rmh@aybabtu.com>
+ * Copyright (C) 2012 Thorsten Alteholz <debian@alteholz.de>
  *
  * This file is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
@@ -151,7 +152,7 @@ int size;
        (c) >= 'A' && (c) <= 'Z' || \
        (c) >= 'a' && (c) <= 'z')
 
-strtol(s, p, base)
+a56_strtol(s, p, base)
 register char *s, **p;
 register int base;
 {