Merge remote-tracking branch 'upstream/master' into a5200

src/ca65/anonname.c

@@ -79,6 +79,3 @@ int IsAnonName (const StrBuf* Name)
     }
     return (strncmp (SB_GetConstBuf (Name), AnonTag, sizeof (AnonTag) - 1) == 0);
 }
-
-
-

src/ca65/anonname.h

@@ -61,7 +61,5 @@ int IsAnonName (const StrBuf* Name);
       
 
 /* End of anonname.h */
+
 #endif
-
-
-

src/ca65/asserts.c

@@ -176,8 +176,3 @@ void WriteAssertions (void)
     /* Done writing the assertions */
     ObjEndAssertions ();
 }
-
-
-
-
-

src/ca65/asserts.h

@@ -74,6 +74,3 @@ void WriteAssertions (void);
 /* End of asserts.h */
 
 #endif
-
-
-

src/ca65/condasm.c

@@ -523,7 +523,3 @@ void CleanupIfStack (unsigned SP)
     /* Calculate the new overall .IF condition */
     CalcOverallIfCond ();
 }
-
-
-
-

src/ca65/condasm.h

@@ -80,6 +80,3 @@ void CleanupIfStack (unsigned SP);
 /* End of condasm.h */
 
 #endif
-
-
-

src/ca65/dbginfo.c

@@ -527,6 +527,3 @@ void WriteHLLDbgSyms (void)
 
     }
 }
-
-
-

src/ca65/dbginfo.h

@@ -67,8 +67,3 @@ void WriteHLLDbgSyms (void);
 /* End of dbginfo.h */
 
 #endif
-
-
-
-
-

src/ca65/ea.h

@@ -63,6 +63,3 @@ struct EffAddr {
 /* End of ea.h */
 
 #endif
-
-
-

src/ca65/ea65.c

@@ -200,7 +200,3 @@ void GetEA (EffAddr* A)
     /* Apply addressing mode overrides */
     A->AddrModeSet &= Restrictions;
 }
-
-
-
-

src/ca65/ea65.h

@@ -62,6 +62,3 @@ void GetEA (EffAddr* A);
 /* End of ea65.h */
 
 #endif
-
-
-

src/ca65/enum.c

@@ -151,7 +151,3 @@ void DoEnum (void)
     /* Free the base expression */
     FreeExpr (BaseExpr);
 }
-
-
-
-

src/ca65/enum.h

@@ -52,6 +52,3 @@ void DoEnum (void);
 /* End of enum.h */
 
 #endif
-
-
-

src/ca65/error.c

@@ -400,6 +400,3 @@ void Internal (const char* Format, ...)
 
     exit (EXIT_FAILURE);
 }
-
-
-

src/ca65/error.h

@@ -38,6 +38,12 @@
 
 
 
+#if defined( __MINGW32__)
+#  pragma GCC diagnostic ignored "-Wformat"
+#endif
+
+
+
 /* common */
 #include "attrib.h"
 #include "coll.h"
@@ -98,7 +104,3 @@ void Internal (const char* Format, ...) attribute((noreturn, format(printf,1,2))
 /* End of error.h */
 
 #endif
-
-
-
-

src/ca65/expr.c

@@ -1942,6 +1942,3 @@ ExprNode* BoundedExpr (ExprNode* (*ExprFunc) (void), unsigned Size)
 {
     return MakeBoundedExpr (ExprFunc (), Size);
 }
-
-
-

src/ca65/expr.h

@@ -179,6 +179,3 @@ ExprNode* BoundedExpr (ExprNode* (*ExprFunc) (void), unsigned Size);
 /* End of expr.h */
 
 #endif
-
-
-

src/ca65/feature.c

@@ -125,6 +125,3 @@ feature_t SetFeature (const StrBuf* Key)
     /* Return the value found */
     return Feature;
 }
-
-
-

src/ca65/feature.h

@@ -94,6 +94,3 @@ feature_t SetFeature (const StrBuf* Key);
 /* End of feature.h */
 
 #endif
-
-
-

src/ca65/filetab.c

@@ -336,5 +336,3 @@ void CreateDependencies (void)
                        FT_MAIN | FT_INCLUDE | FT_BINARY | FT_DBGINFO);
     }
 }
-
-

src/ca65/filetab.h

@@ -90,8 +90,3 @@ void CreateDependencies (void);
 /* End of filetab.h */
 
 #endif
-
-
-
-
-

src/ca65/fragment.c

@@ -66,6 +66,3 @@ Fragment* NewFragment (unsigned char Type, unsigned short Len)
     /* And return it */
     return F;
 }
-
-
-

src/ca65/fragment.h

@@ -82,8 +82,5 @@ Fragment* NewFragment (unsigned char Type, unsigned short Len);
 
 
 /* End of fragment.h */
+
 #endif
-
-
-
-

src/ca65/global.h

@@ -90,6 +90,3 @@ extern unsigned char    UnderlineInNumbers; /* Allow underlines in numbers */
 /* End of global.h */
 
 #endif
-
-
-

src/ca65/incpath.c

@@ -44,8 +44,8 @@
 
 
 
-SearchPath*     IncSearchPath;          /* Standard include path */
-SearchPath*     BinSearchPath;          /* Binary include path */
+SearchPaths*    IncSearchPath;          /* Standard include path */
+SearchPaths*    BinSearchPath;          /* Binary include path */
 
 
 
@@ -75,13 +75,10 @@ void FinishIncludePaths (void)
     AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc");
 
     /* Add some compiled-in search paths if defined at compile time. */
-#ifdef CA65_INC
+#if defined(CA65_INC) && !defined(_WIN32)
     AddSearchPath (IncSearchPath, STRINGIZE (CA65_INC));
 #endif
 
     /* Add paths relative to the parent directory of the Windows binary. */
     AddSubSearchPathFromWinBin (IncSearchPath, "asminc");
 }
-
-
-

src/ca65/incpath.h

@@ -49,8 +49,8 @@
 
 
 
-extern SearchPath*      IncSearchPath;          /* Standard include path */
-extern SearchPath*      BinSearchPath;          /* Binary include path */
+extern SearchPaths*     IncSearchPath;          /* Standard include path */
+extern SearchPaths*     BinSearchPath;          /* Binary include path */
 
 
 
@@ -71,6 +71,3 @@ void FinishIncludePaths (void);
 /* End of incpath.h */
 
 #endif
-
-
-

src/ca65/instr.c

@@ -1521,6 +1521,3 @@ void HandleInstruction (unsigned Index)
     /* Call the handler */
     InsTab->Ins[Index].Emit (&InsTab->Ins[Index]);
 }
-
-
-

src/ca65/instr.h

@@ -179,8 +179,3 @@ void HandleInstruction (unsigned Index);
 /* End of instr.h */
 
 #endif
-
-
-
-
-

src/ca65/istack.c

@@ -156,6 +156,3 @@ void CheckInputStack (void)
         Error ("Open %s", IStack->Desc);
     }
 }
-
-
-

src/ca65/istack.h

@@ -68,7 +68,3 @@ void CheckInputStack (void);
 /* End of istack.h */
 
 #endif
-
-
-
-

src/ca65/lineinfo.c

@@ -501,6 +501,3 @@ void WriteLineInfos (void)
     /* End of line infos */
     ObjEndLineInfos ();
 }
-
-
-

src/ca65/lineinfo.h

@@ -115,8 +115,5 @@ void WriteLineInfos (void);
 
 
 /* End of lineinfo.h */
+
 #endif
-
-
-
-

src/ca65/listing.c

@@ -452,6 +452,3 @@ void CreateListing (void)
     /* Close the listing file */
     (void) fclose (F);
 }
-
-
-

src/ca65/listing.h

@@ -123,6 +123,3 @@ void CreateListing (void);
 /* End of listing.h */
 
 #endif
-
-
-

src/ca65/macro.c

@@ -1049,6 +1049,3 @@ void EnableDefineStyleMacros (void)
     PRECONDITION (DisableDefines > 0);
     --DisableDefines;
 }
-
-
-

src/ca65/macro.h

@@ -110,6 +110,3 @@ void EnableDefineStyleMacros (void);
 /* End of macro.h */
 
 #endif
-
-
-

src/ca65/main.c

@@ -1120,6 +1120,3 @@ int main (int argc, char* argv [])
     /* Return an apropriate exit code */
     return (ErrorCount == 0)? EXIT_SUCCESS : EXIT_FAILURE;
 }
-
-
-

src/ca65/nexttok.c

@@ -816,6 +816,3 @@ void LeaveRawTokenMode (void)
     PRECONDITION (RawMode > 0);
     --RawMode;
 }
-
-
-

src/ca65/nexttok.h

@@ -90,7 +90,3 @@ void LeaveRawTokenMode (void);
 /* End of nexttok.h */
 
 #endif
-
-
-
-

src/ca65/objcode.c

@@ -278,6 +278,3 @@ void EmitFill (unsigned long Count)
         GenFragment (FRAG_FILL, Chunk);
     }
 }
-
-
-

src/ca65/objcode.h

@@ -94,6 +94,3 @@ void EmitFill (unsigned long Count);
 /* End of objcode.h */
 
 #endif
-
-
-

src/ca65/objfile.c

@@ -512,6 +512,3 @@ void ObjEndSpans (void)
 {
     Header.SpanSize = ftell (F) - Header.SpanOffs;
 }
-
-
-

src/ca65/objfile.h

@@ -160,6 +160,3 @@ void ObjEndSpans (void);
 /* End of objfile.h */
 
 #endif
-
-
-

src/ca65/options.h

@@ -73,6 +73,3 @@ void WriteOptions (void);
 /* End of options.h */
 
 #endif
-
-
-

src/ca65/pseudo.c

@@ -2145,6 +2145,3 @@ void CheckPseudo (void)
         Warning (1, "CPU stack is not empty");
     }
 }
-
-
-

src/ca65/pseudo.h

@@ -55,6 +55,3 @@ void CheckPseudo (void);
 /* End of pseudo.h */
 
 #endif
-
-
-

src/ca65/repeat.c

@@ -175,6 +175,3 @@ Done:
     /* Switch out of raw token mode */
     LeaveRawTokenMode ();
 }
-
-
-

src/ca65/repeat.h

@@ -52,7 +52,3 @@ void ParseRepeat (void);
 /* End of repeat.h */
 
 #endif
-
-
-
-

src/ca65/scanner.c

@@ -1505,7 +1505,3 @@ void DoneScanner (void)
 {
     DoneCharSource ();
 }
-
-
-
-

src/ca65/scanner.h

@@ -108,7 +108,3 @@ void DoneScanner (void);
 /* End of scanner.h */
 
 #endif
-
-
-
-

src/ca65/segdef.c

@@ -77,7 +77,3 @@ SegDef* DupSegDef (const SegDef* Def)
 {
     return NewSegDef (Def->Name, Def->AddrSize);
 }
-
-
-
-

src/ca65/segdef.h

@@ -81,6 +81,3 @@ SegDef* DupSegDef (const SegDef* D);
 /* End of segdef.h */
 
 #endif
-
-
-

src/ca65/segment.c

@@ -627,7 +627,3 @@ void WriteSegments (void)
     /* Done writing segments */
     ObjEndSegments ();
 }
-
-
-
-

src/ca65/segment.h

@@ -174,6 +174,3 @@ void WriteSegments (void);
 /* End of segment.h */
 
 #endif
-
-
-

src/ca65/sizeof.c

@@ -130,6 +130,3 @@ SymEntry* DefSizeOfSymbol (SymEntry* Sym, long Size)
     SymDef (SizeSym, GenLiteralExpr (Size), ADDR_SIZE_DEFAULT, SF_NONE);
     return SizeSym;
 }
-
-
-

src/ca65/sizeof.h

@@ -95,7 +95,5 @@ struct SymEntry* DefSizeOfSymbol (struct SymEntry* Sym, long Size);
 
 
 /* End of sizeof.h */
+
 #endif
-
-
-

src/ca65/span.c

@@ -407,7 +407,3 @@ void WriteSpans (void)
     /* Done writing the spans */
     ObjEndSpans ();
 }
-
-
-
-

src/ca65/span.h

@@ -117,6 +117,3 @@ void WriteSpans (void);
 /* End of span.h */
 
 #endif
-
-
-

src/ca65/spool.c

@@ -89,6 +89,3 @@ void InitStrPool (void)
     /* Insert an empty string. It will have string id 0 */
     SP_AddStr (StrPool, "");
 }
-
-
-

src/ca65/spool.h

@@ -114,7 +114,3 @@ void InitStrPool (void);
 /* End of spool.h */
 
 #endif
-
-
-
-

src/ca65/struct.c

@@ -299,6 +299,3 @@ void DoUnion (void)
 {
     DoStructInternal (0, UNION);
 }
-
-
-

src/ca65/struct.h

@@ -68,6 +68,3 @@ void DoUnion (void);
 /* End of struct.h */
 
 #endif
-
-
-

src/ca65/studyexpr.c

@@ -1539,6 +1539,3 @@ void StudyExpr (ExprNode* Expr, ExprDesc* D)
     printf ("%u sections:\n", D->SecCount);
 #endif
 }
-
-
-

src/ca65/studyexpr.h

@@ -118,7 +118,5 @@ void StudyExpr (ExprNode* Expr, ExprDesc* D);
 
 
 /* End of studyexpr.h */
+
 #endif
-
-
-

src/ca65/symbol.c

@@ -262,6 +262,3 @@ SymEntry* ParseAnySymName (SymFindAction Action)
     /* Return the symbol found */
     return Sym;
 }
-
-
-

src/ca65/symbol.h

@@ -88,6 +88,3 @@ struct SymEntry* ParseAnySymName (SymFindAction Action);
 /* End of symbol.h */
 
 #endif
-
-
-

src/ca65/symentry.c

@@ -744,6 +744,3 @@ unsigned GetSymInfoFlags (const SymEntry* S, long* ConstVal)
     /* Return the result */
     return Flags;
 }
-
-
-

src/ca65/symentry.h

@@ -359,7 +359,3 @@ unsigned GetSymInfoFlags (const SymEntry* Sym, long* ConstVal);
 /* End of symentry.h */
 
 #endif
-
-
-
-

src/ca65/symtab.c

@@ -1031,6 +1031,3 @@ void WriteScopes (void)
     /* Done writing the scopes */
     ObjEndScopes ();
 }
-
-
-

src/ca65/symtab.h

@@ -178,6 +178,3 @@ void WriteScopes (void);
 /* End of symtab.h */
 
 #endif
-
-
-

src/ca65/token.c

@@ -72,6 +72,3 @@ void CopyToken (Token* Dst, const Token* Src)
     SB_Copy (&Dst->SVal, &Src->SVal);
     Dst->Pos  = Src->Pos;
 }
-
-
-

src/ca65/token.h

@@ -314,6 +314,3 @@ void CopyToken (Token* Dst, const Token* Src);
 /* End of token.h */
 
 #endif
-
-
-

src/ca65/toklist.c

@@ -283,6 +283,3 @@ void PushTokList (TokList* List, const char* Desc)
     ++PushCounter;
     PushInput (ReplayTokList, List, Desc);
 }
-
-
-

src/ca65/toklist.h

@@ -129,7 +129,3 @@ void PushTokList (TokList* List, const char* Desc);
 /* End of toklist.h */
 
 #endif
-
-
-
-

src/ca65/ulabel.c

@@ -223,7 +223,3 @@ void ULabDone (void)
         ReleaseFullLineInfo (&L->LineInfos);
     }
 }
-
-
-
-

src/ca65/ulabel.h

@@ -74,6 +74,3 @@ void ULabDone (void);
 /* End of ulabel.h */
 
 #endif
-
-
-