From 56c96e8ab0f1d0b80c86f0d24d48c64ada4f00ed Mon Sep 17 00:00:00 2001 From: Bas Wassink Date: Sun, 24 Mar 2019 21:15:34 +0100 Subject: [PATCH] Revert accidentally committed changes for a future PR --- src/cc65/locals.c | 2 +- src/cc65/symtab.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cc65/locals.c b/src/cc65/locals.c index 02155f412..e2e71e96c 100644 --- a/src/cc65/locals.c +++ b/src/cc65/locals.c @@ -276,7 +276,7 @@ static void ParseAutoDecl (Declaration* Decl) ** numbers. */ CollReplace (&CurrentFunc->LocalsBlockStack, - (void *)(size_t)GetCurrentLine (), + (void *)(long)GetCurrentLine (), CollCount (&CurrentFunc->LocalsBlockStack) - 1); } else { diff --git a/src/cc65/symtab.c b/src/cc65/symtab.c index 72f7f54da..02b7f0501 100644 --- a/src/cc65/symtab.c +++ b/src/cc65/symtab.c @@ -671,7 +671,7 @@ DefOrRef* AddDefOrRef (SymEntry* E, unsigned Flags) DOR = xmalloc (sizeof (DefOrRef)); CollAppend (E->V.L.DefsOrRefs, DOR); DOR->Line = GetCurrentLine (); - DOR->LocalsBlockId = (ssize_t)CollLast (&CurrentFunc->LocalsBlockStack); + DOR->LocalsBlockId = CollLast (&CurrentFunc->LocalsBlockStack); DOR->Flags = Flags; DOR->StackPtr = StackPtr; DOR->Depth = CollCount (&CurrentFunc->LocalsBlockStack); @@ -729,9 +729,9 @@ SymEntry* AddLabelSym (const char* Name, unsigned Flags) /* Are we jumping into a block with initalization of an object that ** has automatic storage duration? Let's emit a warning. */ - if ((size_t)CollLast (AIC) != (size_t)(DOR->LocalsBlockId) && + if ((long)CollLast (AIC) != DOR->LocalsBlockId && (CollCount (AIC) < DOR->Depth || - (size_t)CollAt (AIC, DOR->Depth - 1) != DOR->LocalsBlockId)) { + (long)CollAt (AIC, DOR->Depth - 1) != DOR->LocalsBlockId)) { Warning ("Goto at line %d to label %s jumps into a block with " "initialization of an object that has automatic storage duration", GetCurrentLine (), Name); @@ -758,9 +758,9 @@ SymEntry* AddLabelSym (const char* Name, unsigned Flags) /* Are we jumping into a block with initalization of an object that ** has automatic storage duration? Let's emit a warning. */ - if ((ssize_t)CollLast (AIC) != DOR->LocalsBlockId && + if ((long)CollLast (AIC) != DOR->LocalsBlockId && (CollCount (AIC) >= DOR->Depth || - (ssize_t)CollLast (AIC) >= (long)DOR->Line)) + (long)CollLast (AIC) >= (long)DOR->Line)) Warning ("Goto at line %d to label %s jumps into a block with " "initialization of an object that has automatic storage duration", DOR->Line, Name); -- 2.39.2