From ac3b73ef0556ed8a71ff7c5ce6702ba32f9b8ce1 Mon Sep 17 00:00:00 2001 From: borutr Date: Fri, 20 Apr 2007 16:16:15 +0000 Subject: [PATCH] * src/z80/main.c: replaced reserved keyword asm with asmblr git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4759 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 4 ++++ src/z80/main.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index acee9ddd..1ecf5e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-04-20 Borut Razem + + * src/z80/main.c: replaced reserved keyword asm with asmblr + 2007-04-19 Borut Razem * src/port.h: use const poiters to strings diff --git a/src/z80/main.c b/src/z80/main.c index 55e9cd51..446db99c 100644 --- a/src/z80/main.c +++ b/src/z80/main.c @@ -413,9 +413,9 @@ _parseOptions (int *pargc, char **argv, int *i) } else if (!strncmp (argv[*i], OPTION_ASM, sizeof (OPTION_ASM) - 1)) { - char *asm = getStringArg (OPTION_ASM, argv, i, *pargc); + char *asmblr = getStringArg (OPTION_ASM, argv, i, *pargc); - if (!strcmp (asm, "rgbds")) + if (!strcmp (asmblr, "rgbds")) { asm_addTree (&_rgbds_gb); gbz80_port.assembler.cmd = _gbz80_rgbasmCmd; @@ -424,12 +424,12 @@ _parseOptions (int *pargc, char **argv, int *i) _G.asmType = ASM_TYPE_RGBDS; return TRUE; } - else if (!strcmp (asm, "asxxxx")) + else if (!strcmp (asmblr, "asxxxx")) { _G.asmType = ASM_TYPE_ASXXXX; return TRUE; } - else if (!strcmp (asm, "isas")) + else if (!strcmp (asmblr, "isas")) { asm_addTree (&_isas_gb); /* Munge the function prefix */ @@ -437,7 +437,7 @@ _parseOptions (int *pargc, char **argv, int *i) _G.asmType = ASM_TYPE_ISAS; return TRUE; } - else if (!strcmp (asm, "z80asm")) + else if (!strcmp (asmblr, "z80asm")) { port->assembler.externGlobal = TRUE; asm_addTree (&_z80asm_z80); -- 2.39.5