From ce58a924feba155c16c74589ade84db2cd3e9c34 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Sat, 26 May 2007 21:57:11 +0000 Subject: [PATCH] Fix builds with Turbo C. git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1330 6ac86273-5f31-0410-b378-82cca8765d1b --- hdr/nls.h | 2 +- kernel/makefile | 4 ++-- kernel/nls.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hdr/nls.h b/hdr/nls.h index 2e595ce..824a68c 100644 --- a/hdr/nls.h +++ b/hdr/nls.h @@ -473,7 +473,7 @@ struct nlsInfoBlock { /* This block contains all information hardcoded U.S.A./CP437 */ }; -extern struct nlsInfoBlock nlsInfo; +extern struct nlsInfoBlock ASM nlsInfo; extern struct nlsPackage ASM nlsPackageHardcoded; /* These are the "must have" tables within the hard coded NLS pkg */ extern struct nlsFnamTerm nlsFnameTermHardcoded; diff --git a/kernel/makefile b/kernel/makefile index ec9a12c..75e7eb1 100644 --- a/kernel/makefile +++ b/kernel/makefile @@ -38,8 +38,8 @@ production: ..\bin\$(TARGET).sys kernel.sys: kernel.exe ..\utils\exeflat.exe ..\utils\exeflat kernel.exe kernelf.exe 0x60 -S0x10 -S0x74 -E - if exist kernelf.exe $(XUPX) kernelf.exe - if exist kernelf.sys $(XUPX) kernelf.sys + $(COMSPEC) /c if exist kernelf.exe $(XUPX) kernelf.exe + $(COMSPEC) /c if exist kernelf.sys $(XUPX) kernelf.sys ..\utils\exeflat kernelf.exe kernel.sys 0x60 $(UPXOPT) -$(RM) kernelf.exe kernelf.sys diff --git a/kernel/nls.c b/kernel/nls.c index 2cb1f5f..be3fdef 100644 --- a/kernel/nls.c +++ b/kernel/nls.c @@ -55,7 +55,7 @@ static BYTE *RcsId = #endif #endif -struct nlsInfoBlock nlsInfo = { +struct nlsInfoBlock ASM nlsInfo = { (char FAR *)0 /* filename to COUNTRY.SYS */ , 437 /* system code page */ /* Implementation flags */