More fixes for Watcom C / C89.

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

diff --git a/src/ca65/main.c b/src/ca65/main.c
index 462fb464a3ad54c328fcce58a983fb4cd586b909..151672702102c384f6c859bfd50969feb51dba7a 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -147,13 +147,14 @@ static void NewSymbol (const char* SymName, long Val)
 /* Define a symbol with a fixed numeric value in the current scope */
 {
     ExprNode* Expr;
+    SymEntry* Sym;
 
     /* Convert the name to a string buffer */
     StrBuf SymBuf = STATIC_STRBUF_INITIALIZER;
     SB_CopyStr (&SymBuf, SymName);
 
     /* Search for the symbol, allocate a new one if it doesn't exist */
-    SymEntry* Sym = SymFind (CurrentScope, &SymBuf, SYM_ALLOC_NEW);
+    Sym = SymFind (CurrentScope, &SymBuf, SYM_ALLOC_NEW);
 
     /* Check if have already a symbol with this name */
     if (SymIsDef (Sym)) {
@@ -295,7 +296,7 @@ static void DefineSymbol (const char* Def)
        InvDef (Def);
     }
     P = Def;
-         
+
     /* Copy the symbol, checking the rest */
     I = 0;
     while (IsIdChar (*P)) {

diff --git a/src/ca65/pseudo.c b/src/ca65/pseudo.c
index 4f6b62973a0d9185b965fa2dad4712bb3dbecc31..0c9a2fa111eaf443def235a7945755e94c427af4 100644 (file)
--- a/src/ca65/pseudo.c
+++ b/src/ca65/pseudo.c
@@ -1144,7 +1144,7 @@ static void DoInclude (void)
     /* Name must follow */
     if (Tok != TOK_STRCON) {
        ErrorSkip ("String constant expected");
-    } else {          
+    } else {
         SB_Terminate (&SVal);
        NewInputFile (SB_GetConstBuf (&SVal));
     }
@@ -1558,9 +1558,11 @@ static void DoSetCPU (void)
     if (Tok != TOK_STRCON) {
        ErrorSkip ("String constant expected");
     } else {
+        cpu_t CPU;
+
         /* Try to find the CPU */
         SB_Terminate (&SVal);
-        cpu_t CPU = FindCPU (SB_GetConstBuf (&SVal));
+        CPU = FindCPU (SB_GetConstBuf (&SVal));
 
         /* Switch to the new CPU */
         SetCPU (CPU);

diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index 8b7ef96567565ee5b89a82af3835433fd8b3371a..891971c95a92323b03f289c51ded7af1f3c03797 100644 (file)
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -646,9 +646,13 @@ static unsigned char FindDotKeyword (void)
  * return TOK_NONE if not found.
  */
 {
-    struct DotKeyword K = { SB_GetConstBuf (&SVal), 0 };
+    struct DotKeyword K;
     struct DotKeyword* R;
 
+    /* Initialize K */
+    K.Key = SB_GetConstBuf (&SVal);
+    K.Tok = 0;
+
     /* If we aren't in ignore case mode, we have to uppercase the keyword */
     if (!IgnoreCase) {
        UpcaseSVal ();

diff --git a/src/ca65/symbol.c b/src/ca65/symbol.c
index c81899fa9f0d90e6510defd5d86ecbe4a5b12149..444decfc5c3e95694ebc296b169c5361430323cf 100644 (file)
--- a/src/ca65/symbol.c
+++ b/src/ca65/symbol.c
@@ -62,12 +62,13 @@ SymTable* ParseScopedIdent (StrBuf* Name, StrBuf* FullName)
  * by the caller for error messages or similar.
  */
 {
+    SymTable* Scope;
+
     /* Clear both passed string buffers */
     SB_Clear (Name);
     SB_Clear (FullName);
 
     /* Get the starting table */
-    SymTable* Scope;
     if (Tok == TOK_NAMESPACE) {
 
         /* Start from the root scope */

diff --git a/src/ca65/symentry.h b/src/ca65/symentry.h
index 5da15a59f12fa19bec1501bb9879b8b303ebb47a..42b281ed7331ef2932c078af953d4397755f7e96 100644 (file)
--- a/src/ca65/symentry.h
+++ b/src/ca65/symentry.h
@@ -312,7 +312,7 @@ INLINE const StrBuf* GetSymName (const SymEntry* S)
     return GetStrBuf (S->Name);
 }
 #else
-#  define GetSymName(S)   GetString ((S)->Name)
+#  define GetSymName(S)   GetStrBuf ((S)->Name)
 #endif
 
 #if defined(HAVE_INLINE)
@@ -353,3 +353,4 @@ INLINE const FilePos* GetSymPos (const SymEntry* S)
 
 
 
+