Added a comment about the fix explaining why the given order of calls is necessary.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5035 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 4babea30f36fe099155d80d954a4c44c96ce8596..ddf88b9949f0ea92567895d9cae1e41019cef0bd 100644 (file)
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -677,7 +677,10 @@ static void StartExpClassic (Macro* M)
     token_t     Term;
 
 
-    /* Create a structure holding expansion data */
+    /* Create a structure holding expansion data. This must be done before 
+     * skipping the macro name, because the call to NextTok may cause a new
+     * expansion if the next token is actually a .define style macro.
+     */
     E = NewMacExp (M);
 
     /* Skip the macro name */

diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak
index 788ba8cd896fd1f379f914886e2b32468a9bf5a1..b82923bafe3a7116ef8ddf3c25536696dd91c1e5 100644 (file)
--- a/src/ca65/make/gcc.mak
+++ b/src/ca65/make/gcc.mak
@@ -15,7 +15,7 @@ CA65_INC = \"/usr/lib/cc65/asminc/\"
 
 #
 CC     = gcc
-CFLAGS         = -g -Wall -W -std=c89
+CFLAGS         = -g -O2 -Wall -W -std=c89
 override CFLAGS += -I$(COMMON)
 override CFLAGS += -DCA65_INC=$(CA65_INC)
 EBIND  = emxbind