* 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

diff --git a/ChangeLog b/ChangeLog
index acee9ddd92766addcfebea1c50a373b345da58a4..1ecf5e45aaa02dacd3b5eda68ff658db0020aa84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-20 Borut Razem <borut.razem AT siol.net>
+
+       * src/z80/main.c: replaced reserved keyword asm with asmblr
+
 2007-04-19 Borut Razem <borut.razem AT siol.net>
 
        * src/port.h: use const poiters to strings

diff --git a/src/z80/main.c b/src/z80/main.c
index 55e9cd51621ff4329e2ef7732169e73f5cd0ec62..446db99cdb84018862cc210004085e77a85d6b33 100644 (file)
--- 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);