From d14148ab4f9d8d1d52025eac31bfc09d977fbaa7 Mon Sep 17 00:00:00 2001
From: Greg King <gregdk@users.sf.net>
Date: Mon, 17 May 2021 19:48:47 -0400
Subject: [PATCH] Restricted commit b9a3c7888822732a0de92741cfe1a3e1b6bb272f to
 classic-style Assembly macros.

.include will work at expansion-time for .define macros.
---
 src/ca65/macro.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 34d87e65f..d6c807035 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -438,9 +438,7 @@ void MacDef (unsigned Style)
 
     /* Parse the parameter list */
     if (HaveParams) {
-
         while (CurTok.Tok == TOK_IDENT) {
-
             /* Create a struct holding the identifier */
             IdDesc* I = NewIdDesc (&CurTok.SVal);
 
@@ -449,6 +447,7 @@ void MacDef (unsigned Style)
                 M->Params = I;
             } else {
                 IdDesc* List = M->Params;
+
                 while (1) {
                     if (SB_Compare (&List->Id, &CurTok.SVal) == 0) {
                         Error ("Duplicate symbol '%m%p'", &CurTok.SVal);
@@ -490,9 +489,8 @@ void MacDef (unsigned Style)
     ** the .LOCAL command is detected and removed, at this time.
     */
     while (1) {
-
         /* Check for include */
-        if (CurTok.Tok == TOK_INCLUDE) {
+        if (CurTok.Tok == TOK_INCLUDE && Style == MAC_STYLE_CLASSIC) {
             /* Include another file */
             NextTok ();
             /* Name must follow */
@@ -529,9 +527,7 @@ void MacDef (unsigned Style)
 
         /* Check for a .LOCAL declaration */
         if (CurTok.Tok == TOK_LOCAL && Style == MAC_STYLE_CLASSIC) {
-
             while (1) {
-
                 IdDesc* I;
 
                 /* Skip .local or comma */
@@ -570,6 +566,7 @@ void MacDef (unsigned Style)
         if (CurTok.Tok == TOK_IDENT) {
             unsigned Count = 0;
             IdDesc* I = M->Params;
+
             while (I) {
                 if (SB_Compare (&I->Id, &CurTok.SVal) == 0) {
                     /* Local param name, replace it */