From b01c0adf49f04a7ff4fc7b59def3d9f9cde74b45 Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sun, 30 Jul 2000 21:27:37 +0000
Subject: [PATCH] Include file path changes

git-svn-id: svn://svn.cc65.org/cc65/trunk@243 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/ca65/objfile.c  |  8 +++++---
 src/ca65/scanner.c  | 10 ++++++----
 src/ca65/symtab.c   | 28 +++++++++++++++-------------
 src/ld65/segments.c | 28 +++++++++++++++-------------
 4 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/ca65/objfile.c b/src/ca65/objfile.c
index ca2e872ad..5308580dd 100644
--- 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 4ebe06774..4647d4c01 100644
--- 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 d1f7ce101..d7997fa7b 100644
--- 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 3b18eea75..66b6f1ea0 100644
--- 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;
        	}
 
-- 
2.39.5