Include file path changes

git-svn-id: svn://svn.cc65.org/cc65/trunk@243 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2000-07-30 21:27:37 +00:00
parent a01a9429ba
commit b01c0adf49
4 changed files with 41 additions and 33 deletions

View file

@ -38,9 +38,11 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "../common/fname.h" /* common */
#include "../common/objdefs.h" #include "fname.h"
#include "objdefs.h"
/* ca65 */
#include "global.h" #include "global.h"
#include "error.h" #include "error.h"
#include "objfile.h" #include "objfile.h"

View file

@ -40,9 +40,11 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "../common/fname.h" /* common */
#include "../common/xmalloc.h" #include "fname.h"
#include "xmalloc.h"
/* ca65 */
#include "condasm.h" #include "condasm.h"
#include "error.h" #include "error.h"
#include "global.h" #include "global.h"
@ -64,7 +66,7 @@
enum Token Tok = TOK_NONE; /* Current token */ enum Token Tok = TOK_NONE; /* Current token */
int WS; /* Flag: Whitespace before token */ int WS; /* Flag: Whitespace before token */
long IVal; /* Integer token attribute */ long IVal; /* Integer token attribute */
char SVal [MAX_STR_LEN+1]; /* String token attribute */ char SVal [MAX_STR_LEN+1]; /* String token attribute */

View file

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

View file

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