6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-12 02:30:44 +00:00
Code Issues Projects Releases Wiki Activity

Fixed an error in macro expansion: If the first token after the macro name was

Browse Source 
a .define style macro, the assembler run into an internal error, because the
expansion of the second macro was started before the first one


git-svn-id: svn://svn.cc65.org/cc65/trunk@5034 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2011-06-05 14:45:37 +00:00
parent 6a48359d23
commit 46f1285208
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ca65/macro.c
View File

@ -677,12 +677,12 @@ static void StartExpClassic (Macro* M)
token_t Term; token_t Term;
/* Skip the macro name */
NextTok ();
/* Create a structure holding expansion data */ /* Create a structure holding expansion data */
E = NewMacExp (M); E = NewMacExp (M);
/* Skip the macro name */
NextTok ();
/* Read the actual parameters */ /* Read the actual parameters */
while (!TokIsSep (CurTok.Tok)) { while (!TokIsSep (CurTok.Tok)) {

2
src/ca65/make/gcc.mak
View File

@ -15,7 +15,7 @@ CA65_INC = \"/usr/lib/cc65/asminc/\"
# #
CC = gcc CC = gcc
CFLAGS = -g -O2 -Wall -W -std=c89 CFLAGS = -g -Wall -W -std=c89
override CFLAGS += -I$(COMMON) override CFLAGS += -I$(COMMON)
override CFLAGS += -DCA65_INC=$(CA65_INC) override CFLAGS += -DCA65_INC=$(CA65_INC)
EBIND = emxbind EBIND = emxbind