From: Thorsten Alteholz Date: Wed, 27 Dec 2017 20:22:12 +0000 (-0800) Subject: a56: parameters of this strtol() differ from strtol() in stdlib.h - rename it to... X-Git-Tag: v1.1~14 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f07be12031abba293b71032ba5bf986025c88576;p=librecmc%2Flinux-libre-firmware.git a56: parameters of this strtol() differ from strtol() in stdlib.h - rename it to a56_strtol This is incorporated from the Debian version of the package. --- diff --git a/a56/lex.c b/a56/lex.c index 72864ca..2f09a34 100644 --- a/a56/lex.c +++ b/a56/lex.c @@ -8,6 +8,25 @@ *******************************************************\ /* + * Copyright (C) 2012 Thorsten Alteholz + * + * 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 + * . + * + * 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 f0e0b9d..5166717 100644 --- a/a56/subs.c +++ b/a56/subs.c @@ -9,6 +9,7 @@ /* * Copyright (C) 2008 Robert Millan + * Copyright (C) 2012 Thorsten Alteholz * * 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; {