From dffb0e9a7acbc4866043bc49e7be47bb6b9d4f7e Mon Sep 17 00:00:00 2001 From: David Welch Date: Thu, 30 Aug 2001 20:38:20 +0000 Subject: [PATCH] Changed internal/config.h -> roscfg.h in a number of files. Use a proper prefix for executing programs in tools/Makefile. svn path=/trunk/; revision=2205 --- reactos/include/ntdll/ldr.h | 2 +- reactos/ntoskrnl/cm/import.c | 4 ++-- reactos/ntoskrnl/cm/ntfunc.c | 2 +- reactos/ntoskrnl/cm/regfile.c | 2 +- reactos/ntoskrnl/cm/registry.c | 4 ++-- reactos/ntoskrnl/cm/regobj.c | 2 +- reactos/ntoskrnl/cm/rtlfunc.c | 2 +- reactos/ntoskrnl/dbg/dbgctrl.c | 2 +- reactos/ntoskrnl/ex/power.c | 2 +- reactos/ntoskrnl/hal/x86/enum.c | 4 ++-- reactos/ntoskrnl/hal/x86/halinit.c | 4 ++-- reactos/ntoskrnl/hal/x86/mp.c | 4 ++-- reactos/ntoskrnl/include/internal/debug.h | 2 +- reactos/ntoskrnl/include/internal/module.h | 2 +- reactos/ntoskrnl/io/device.c | 4 ++-- reactos/ntoskrnl/kd/dlog.c | 4 ++-- reactos/ntoskrnl/kd/kdebug.c | 4 ++-- reactos/ntoskrnl/ke/i386/exp.c | 2 +- reactos/ntoskrnl/ke/i386/irq.c | 4 ++-- reactos/ntoskrnl/ke/i386/multiboot.S | 2 +- reactos/ntoskrnl/ke/spinlock.c | 4 ++-- reactos/ntoskrnl/ldr/loader.c | 4 ++-- reactos/ntoskrnl/mm/mminit.c | 4 ++-- reactos/ntoskrnl/ob/object.c | 4 ++-- reactos/ntoskrnl/po/power.c | 4 ++-- reactos/rules.mak | 3 ++- reactos/tools/Makefile | 2 +- 27 files changed, 42 insertions(+), 41 deletions(-) diff --git a/reactos/include/ntdll/ldr.h b/reactos/include/ntdll/ldr.h index 326b0534437..998584e7ba6 100644 --- a/reactos/include/ntdll/ldr.h +++ b/reactos/include/ntdll/ldr.h @@ -1,5 +1,5 @@ #include -#include "../ntoskrnl/include/internal/config.h" +#include typedef NTSTATUS STDCALL (*PEPFUNC)(PPEB); diff --git a/reactos/ntoskrnl/cm/import.c b/reactos/ntoskrnl/cm/import.c index 1100e9f50f4..b25faee7b37 100644 --- a/reactos/ntoskrnl/cm/import.c +++ b/reactos/ntoskrnl/cm/import.c @@ -1,4 +1,4 @@ -/* $Id: import.c,v 1.1 2001/08/29 05:06:31 rex Exp $ +/* $Id: import.c,v 1.2 2001/08/30 20:38:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c index 2fa394fcfa1..3edef3bbfd1 100644 --- a/reactos/ntoskrnl/cm/ntfunc.c +++ b/reactos/ntoskrnl/cm/ntfunc.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c index bd0c4de64c5..8f684d41e5b 100644 --- a/reactos/ntoskrnl/cm/regfile.c +++ b/reactos/ntoskrnl/cm/regfile.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/cm/registry.c b/reactos/ntoskrnl/cm/registry.c index f443e5d2433..2ea9bff83a5 100644 --- a/reactos/ntoskrnl/cm/registry.c +++ b/reactos/ntoskrnl/cm/registry.c @@ -1,4 +1,4 @@ -/* $Id: registry.c,v 1.63 2001/08/29 05:06:31 rex Exp $ +/* $Id: registry.c,v 1.64 2001/08/30 20:38:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,7 @@ */ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/cm/regobj.c b/reactos/ntoskrnl/cm/regobj.c index 1171ffc86fb..77ab6cf033b 100644 --- a/reactos/ntoskrnl/cm/regobj.c +++ b/reactos/ntoskrnl/cm/regobj.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/cm/rtlfunc.c b/reactos/ntoskrnl/cm/rtlfunc.c index 544939bb6ea..3114f8ecb8f 100644 --- a/reactos/ntoskrnl/cm/rtlfunc.c +++ b/reactos/ntoskrnl/cm/rtlfunc.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/dbg/dbgctrl.c b/reactos/ntoskrnl/dbg/dbgctrl.c index 4d310ef6021..237ca0271ec 100644 --- a/reactos/ntoskrnl/dbg/dbgctrl.c +++ b/reactos/ntoskrnl/dbg/dbgctrl.c @@ -26,7 +26,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #include #define NDEBUG diff --git a/reactos/ntoskrnl/ex/power.c b/reactos/ntoskrnl/ex/power.c index 1bbec0aa654..c1fa7242d60 100644 --- a/reactos/ntoskrnl/ex/power.c +++ b/reactos/ntoskrnl/ex/power.c @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/hal/x86/enum.c b/reactos/ntoskrnl/hal/x86/enum.c index 6f1a1fd3ec7..25440090eda 100644 --- a/reactos/ntoskrnl/hal/x86/enum.c +++ b/reactos/ntoskrnl/hal/x86/enum.c @@ -1,4 +1,4 @@ -/* $Id: enum.c,v 1.1 2001/05/01 23:08:18 chorns Exp $ +/* $Id: enum.c,v 1.2 2001/08/30 20:38:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #define NDEBUG #include diff --git a/reactos/ntoskrnl/hal/x86/halinit.c b/reactos/ntoskrnl/hal/x86/halinit.c index f377978b9ed..9b58c5a22ba 100644 --- a/reactos/ntoskrnl/hal/x86/halinit.c +++ b/reactos/ntoskrnl/hal/x86/halinit.c @@ -1,4 +1,4 @@ -/* $Id: halinit.c,v 1.22 2001/05/01 23:08:18 chorns Exp $ +/* $Id: halinit.c,v 1.23 2001/08/30 20:38:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #include #include diff --git a/reactos/ntoskrnl/hal/x86/mp.c b/reactos/ntoskrnl/hal/x86/mp.c index 957f45c09ed..09dd2271dda 100644 --- a/reactos/ntoskrnl/hal/x86/mp.c +++ b/reactos/ntoskrnl/hal/x86/mp.c @@ -1,4 +1,4 @@ -/* $Id: mp.c,v 1.15 2001/04/26 14:26:22 phreak Exp $ +/* $Id: mp.c,v 1.16 2001/08/30 20:38:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -15,7 +15,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #define NDEBUG #include diff --git a/reactos/ntoskrnl/include/internal/debug.h b/reactos/ntoskrnl/include/internal/debug.h index 43494437794..8ab9d1de2bf 100644 --- a/reactos/ntoskrnl/include/internal/debug.h +++ b/reactos/ntoskrnl/include/internal/debug.h @@ -19,7 +19,7 @@ #define __INTERNAL_DEBUG #include -#include +#include #include #define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;); } while(0); diff --git a/reactos/ntoskrnl/include/internal/module.h b/reactos/ntoskrnl/include/internal/module.h index 388dcf21e79..1ef3ba3a25f 100644 --- a/reactos/ntoskrnl/include/internal/module.h +++ b/reactos/ntoskrnl/include/internal/module.h @@ -3,7 +3,7 @@ #define __MODULE_H #include -#include +#include #include #include diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c index 488d10c74ee..7ba8ec42b18 100644 --- a/reactos/ntoskrnl/io/device.c +++ b/reactos/ntoskrnl/io/device.c @@ -1,4 +1,4 @@ -/* $Id: device.c,v 1.31 2001/08/26 17:27:00 ekohl Exp $ +/* $Id: device.c,v 1.32 2001/08/30 20:38:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -19,7 +19,7 @@ #include #include #include -#include +#include #define NDEBUG #include diff --git a/reactos/ntoskrnl/kd/dlog.c b/reactos/ntoskrnl/kd/dlog.c index 4969b38c290..9e0b0a70238 100644 --- a/reactos/ntoskrnl/kd/dlog.c +++ b/reactos/ntoskrnl/kd/dlog.c @@ -1,4 +1,4 @@ -/* $Id: dlog.c,v 1.3 2001/05/01 23:08:19 chorns Exp $ +/* $Id: dlog.c,v 1.4 2001/08/30 20:38:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c index 0a490f0c61b..22a618d238d 100644 --- a/reactos/ntoskrnl/kd/kdebug.c +++ b/reactos/ntoskrnl/kd/kdebug.c @@ -1,4 +1,4 @@ -/* $Id: kdebug.c,v 1.27 2001/06/21 04:12:19 rex Exp $ +/* $Id: kdebug.c,v 1.28 2001/08/30 20:38:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "../dbg/kdb.h" /* serial debug connection */ diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c index 8ee7c3c0a64..89d116ce259 100644 --- a/reactos/ntoskrnl/ke/i386/exp.c +++ b/reactos/ntoskrnl/ke/i386/exp.c @@ -28,7 +28,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/ke/i386/irq.c b/reactos/ntoskrnl/ke/i386/irq.c index 1747b273570..3e37fdbfdfb 100644 --- a/reactos/ntoskrnl/ke/i386/irq.c +++ b/reactos/ntoskrnl/ke/i386/irq.c @@ -1,4 +1,4 @@ -/* $Id: irq.c,v 1.14 2001/04/26 14:26:22 phreak Exp $ +/* $Id: irq.c,v 1.15 2001/08/30 20:38:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -19,7 +19,7 @@ /* INCLUDES ****************************************************************/ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/ke/i386/multiboot.S b/reactos/ntoskrnl/ke/i386/multiboot.S index 2630caa6dba..128b861a016 100644 --- a/reactos/ntoskrnl/ke/i386/multiboot.S +++ b/reactos/ntoskrnl/ke/i386/multiboot.S @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c index 4761dc7ec24..8a744cfefb7 100644 --- a/reactos/ntoskrnl/ke/spinlock.c +++ b/reactos/ntoskrnl/ke/spinlock.c @@ -1,4 +1,4 @@ -/* $Id: spinlock.c,v 1.10 2001/04/26 14:26:22 phreak Exp $ +/* $Id: spinlock.c,v 1.11 2001/08/30 20:38:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -17,7 +17,7 @@ /* INCLUDES ****************************************************************/ #include -#include +#include #include diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c index b2ce0ca5618..2c898cf1a0c 100644 --- a/reactos/ntoskrnl/ldr/loader.c +++ b/reactos/ntoskrnl/ldr/loader.c @@ -1,4 +1,4 @@ -/* $Id: loader.c,v 1.87 2001/08/26 17:27:44 ekohl Exp $ +/* $Id: loader.c,v 1.88 2001/08/30 20:38:20 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c index 649066e6411..2a9f22713f7 100644 --- a/reactos/ntoskrnl/mm/mminit.c +++ b/reactos/ntoskrnl/mm/mminit.c @@ -1,4 +1,4 @@ -/* $Id: mminit.c,v 1.24 2001/08/13 16:39:01 ekohl Exp $ +/* $Id: mminit.c,v 1.25 2001/08/30 20:38:20 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c index 0ebe707f1a7..79bf5467b37 100644 --- a/reactos/ntoskrnl/ob/object.c +++ b/reactos/ntoskrnl/ob/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.39 2001/06/16 14:10:55 ekohl Exp $ +/* $Id: object.c,v 1.40 2001/08/30 20:38:20 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #include #include #include diff --git a/reactos/ntoskrnl/po/power.c b/reactos/ntoskrnl/po/power.c index c0c549e1243..31c15ffa30a 100644 --- a/reactos/ntoskrnl/po/power.c +++ b/reactos/ntoskrnl/po/power.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: power.c,v 1.3 2001/05/01 23:08:20 chorns Exp $ +/* $Id: power.c,v 1.4 2001/08/30 20:38:20 dwelch Exp $ * PROJECT: ReactOS kernel * FILE: ntoskrnl/po/power.c * PURPOSE: Power Manager @@ -26,7 +26,7 @@ * 16/04/2001 CSH Stubs added */ #include -#include +#include #include #include diff --git a/reactos/rules.mak b/reactos/rules.mak index dbbc379eda9..54ad179dcd4 100644 --- a/reactos/rules.mak +++ b/reactos/rules.mak @@ -20,7 +20,8 @@ endif # ifeq ($(HOST),mingw32-linux) NASM_FORMAT = win32 -PREFIX = i586-mingw32- +#PREFIX = i586-mingw32- +PREFIX = /usr/mingw32-2.95.3-fc/bin/mingw32-pc- EXE_POSTFIX := EXE_PREFIX := ./ DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile index 3bb0dd2489c..f026f90b7fe 100644 --- a/reactos/tools/Makefile +++ b/reactos/tools/Makefile @@ -14,7 +14,7 @@ all: $(TOOLS) buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h $(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c - buildno$(EXE_POSTFIX) + $(EXE_PREFIX)buildno$(EXE_POSTFIX) depends$(EXE_POSTFIX): depends.c $(HOST_CC) $(CFLAGS) -o depends$(EXE_POSTFIX) depends.c