From 2c6dbdf194118324d2b7e7a875db6dda439ab5fe Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Sun, 4 Aug 2002 10:26:31 +0000 Subject: [PATCH] Fix compilation using -p or -DDEBUG git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@415 6ac86273-5f31-0410-b378-82cca8765d1b --- bin/config.sys | 2 ++ hdr/nls.h | 2 +- kernel/fatfs.c | 4 ++-- kernel/globals.h | 4 +++- kernel/initdisk.c | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/config.sys b/bin/config.sys index b3c420c..1810c89 100644 --- a/bin/config.sys +++ b/bin/config.sys @@ -1,3 +1,5 @@ +rem dos=high +rem device=fdxms.sys (or himem.sys) files=20 buffers=20 rem screen=0x12 diff --git a/hdr/nls.h b/hdr/nls.h index d591541..cf9c849 100644 --- a/hdr/nls.h +++ b/hdr/nls.h @@ -453,7 +453,7 @@ extern struct nlsInfoBlock nlsInfo; extern struct nlsPackage ASM nlsPackageHardcoded; /* These are the "must have" tables within the hard coded NLS pkg */ extern struct nlsFnamTerm nlsFnameTermHardcoded; -extern struct nlsDBCS nlsDBCSHardcoded; +extern struct nlsDBCS ASM nlsDBCSHardcoded; extern struct nlsCharTbl nlsUpcaseHardcoded; extern struct nlsCharTbl nlsFUpcaseHardcoded; extern struct nlsCharTbl nlsCollHardcoded; diff --git a/kernel/fatfs.c b/kernel/fatfs.c index d733bc5..a9d9b9e 100644 --- a/kernel/fatfs.c +++ b/kernel/fatfs.c @@ -322,8 +322,8 @@ f_node_ptr split_path(char * path, char * fcbname) #ifdef DEBUG if (CDSp[path[0]-'A'].cdsFlags & CDSNETWDRV) { - printf("split path called for redirected file: `%s.%s'\n", - fname, fext); + printf("split path called for redirected file: `%s'\n", + fcbname); return (f_node_ptr) 0; } #endif diff --git a/kernel/globals.h b/kernel/globals.h index 91891e3..392d51d 100644 --- a/kernel/globals.h +++ b/kernel/globals.h @@ -287,7 +287,9 @@ extern BYTE ASM ErrorMode, /* Critical error flag */ ASM InDOS, /* In DOS critical section */ ASM OpenMode, /* File Open Attributes */ ASM SAttr, /* Attrib Mask for Dir Search */ - ASM dosidle_flag, ASM Server_Call, ASM CritErrLocus, ASM CritErrAction, ASM CritErrClass, VgaSet, njoined; /* number of joined devices */ + ASM dosidle_flag, ASM Server_Call, ASM CritErrLocus, ASM CritErrAction, + ASM CritErrClass, ASM VgaSet, + ASM njoined; /* number of joined devices */ extern UWORD ASM Int21AX; extern COUNT ASM CritErrCode; diff --git a/kernel/initdisk.c b/kernel/initdisk.c index 5b1b5d7..f054c3e 100644 --- a/kernel/initdisk.c +++ b/kernel/initdisk.c @@ -43,7 +43,7 @@ extern COUNT DOSFAR nUnits; extern UWORD DOSFAR LBA_WRITE_VERIFY; /* floppy parameter table, at 70:xxxx */ -extern unsigned char DOSTEXTFAR int1e_table[0xe]; +extern unsigned char DOSTEXTFAR ASM int1e_table[0xe]; /* * Rev 1.0 13 May 2001 tom ehlert