From b6ac59be03be298570aa86620a2b6fb974b78eeb Mon Sep 17 00:00:00 2001 From: cuz Date: Fri, 29 Jul 2005 20:33:25 +0000 Subject: [PATCH] Fixed a bug git-svn-id: svn://svn.cc65.org/cc65/trunk@3558 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/ld65/config.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ld65/config.c b/src/ld65/config.c index 0a4df83e3..140f80839 100644 --- a/src/ld65/config.c +++ b/src/ld65/config.c @@ -55,6 +55,7 @@ #include "exports.h" #include "global.h" #include "o65.h" +#include "objdata.h" #include "scanner.h" #include "spool.h" @@ -1355,6 +1356,7 @@ static void ParseSymbols (void) long Val = 0L; int Weak = 0; + Export* E; /* Remember the name */ unsigned Name = GetStringId (CfgSVal); @@ -1446,7 +1448,7 @@ static void ParseSymbols (void) } /* Check if the symbol is already defined */ - if (FindExport (Name) != 0) { + if ((E = FindExport (Name)) != 0 && !IsUnresolvedExport (E)) { /* If the symbol is not marked as weak, this is an error. * Otherwise ignore the symbol from the config. */ @@ -1458,8 +1460,8 @@ static void ParseSymbols (void) CreateConstExport (Name, Val); } - /* Skip the semicolon */ - CfgConsumeSemi (); + /* Skip the semicolon */ + CfgConsumeSemi (); } /* Remember we had this section */