Include file path changes

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

diff --git a/src/ca65/objfile.c b/src/ca65/objfile.c
index ca2e872ad5f891430d7c3ea727a773889e3b7842..5308580dd68e7da03c2f0284022b3bfc57fe73bb 100644 (file)
--- a/src/ca65/objfile.c
+++ b/src/ca65/objfile.c
@@ -38,9 +38,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include "../common/fname.h"
-#include "../common/objdefs.h"
-
+/* common */
+#include "fname.h"
+#include "objdefs.h"
+         
+/* ca65 */
 #include "global.h"
 #include "error.h"
 #include "objfile.h"

diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index 4ebe06774cde810dabe29b6a79f4376b6b4ac81c..4647d4c018a9c625091223b0d0b54c73cd3f5244 100644 (file)
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -40,9 +40,11 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "../common/fname.h"
-#include "../common/xmalloc.h"
-
+/* common */
+#include "fname.h"
+#include "xmalloc.h"
+         
+/* ca65 */
 #include "condasm.h"
 #include "error.h"
 #include "global.h"
@@ -64,7 +66,7 @@
 
 
 enum Token Tok = TOK_NONE;             /* Current token */
-int WS;                                        /* Flag: Whitespace before token */
+int WS;                                        /* Flag: Whitespace before token */
 long IVal;                             /* Integer token attribute */
 char SVal [MAX_STR_LEN+1];             /* String token attribute */
 

diff --git a/src/ca65/symtab.c b/src/ca65/symtab.c
index d1f7ce1012191bc4abdf14601a0fcbf451222879..d7997fa7bb57e5d81ac937cfca61d4296d0607e1 100644 (file)
--- a/src/ca65/symtab.c
+++ b/src/ca65/symtab.c
@@ -35,10 +35,12 @@
 
 #include <string.h>
 
-#include "../common/symdefs.h"
-#include "../common/hashstr.h"
-#include "../common/xmalloc.h"
-
+/* common */
+#include "symdefs.h"
+#include "hashstr.h"
+#include "xmalloc.h"
+         
+/* ca65 */
 #include "global.h"
 #include "error.h"
 #include "expr.h"
@@ -985,18 +987,18 @@ void WriteImports (void)
     /* Walk throught list and write all imports to the file */
     S = SymList;
     while (S) {
-       if ((S->Flags & SF_IMPMASK) == SF_IMPVAL) {
-           if (S->Flags & SF_ZP) {
-               ObjWrite8 (IMP_ZP);
-           } else {
-               ObjWrite8 (IMP_ABS);
-           }
+       if ((S->Flags & SF_IMPMASK) == SF_IMPVAL) {
+           if (S->Flags & SF_ZP) {
+               ObjWrite8 (IMP_ZP);
+           } else {
+               ObjWrite8 (IMP_ABS);
+           }
                    ObjWriteStr (S->Name);
-           ObjWritePos (&S->Pos);
-       }
+           ObjWritePos (&S->Pos);
+       }
        S = S->List;
     }
-
+     
     /* Done writing imports */
     ObjEndImports ();
 }

diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index 3b18eea7589c6b213dabdd73fd8281eed3117405..66b6f1ea044655e121c4c9fe8e55bf9d9f385fc9 100644 (file)
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -36,12 +36,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/exprdefs.h"
-#include "../common/hashstr.h"
-#include "../common/segdefs.h"
-#include "../common/symdefs.h"
-#include "../common/xmalloc.h"
-
+/* common */
+#include "exprdefs.h"
+#include "hashstr.h"
+#include "segdefs.h"
+#include "symdefs.h"
+#include "xmalloc.h"
+         
+/* ld65 */
 #include "error.h"
 #include "expr.h"
 #include "fileio.h"
@@ -303,17 +305,17 @@ Section* ReadSection (FILE* F, ObjData* O)
            case FRAG_SEXPR24:
            case FRAG_SEXPR32:
                        Frag = NewFragment (Type & FRAG_TYPEMASK, Type & FRAG_BYTEMASK, Sec);
-               break;
+               break;
 
            case FRAG_FILL:
-               /* Will allocate memory, but we don't care... */
-               Frag = NewFragment (FRAG_FILL, Read16 (F), Sec);
-               break;
+               /* Will allocate memory, but we don't care... */
+               Frag = NewFragment (FRAG_FILL, Read16 (F), Sec);
+               break;
 
            default:
-               Error ("Unknown fragment type in module `%s', segment `%s': %02X",
-                      O->Name, S->Name, Type);
-               /* NOTREACHED */
+               Error ("Unknown fragment type in module `%s', segment `%s': %02X",
+                      O->Name, S->Name, Type);
+               /* NOTREACHED */
                return 0;
                }