From e3502f710b9d33a017d04599ce91a141d5c54b69 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Mon, 13 Jun 2005 14:36:02 +0000
Subject: [PATCH] did I miss a "the tree isn't supposed to build anymore" memo
 or what? fixes for compilation with GCC 3.3.3

svn path=/trunk/; revision=15883
---
 reactos/drivers/net/npf/win_bpf.h      |  2 ++
 reactos/lib/adns/src/internal.h        |  2 +-
 reactos/ntoskrnl/include/internal/kd.h | 12 ++++--------
 reactos/ntoskrnl/include/internal/ke.h |  3 +--
 reactos/ntoskrnl/kd/wrappers/gdbstub.c | 14 --------------
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/reactos/drivers/net/npf/win_bpf.h b/reactos/drivers/net/npf/win_bpf.h
index f620ad809e7..91e296b46fa 100644
--- a/reactos/drivers/net/npf/win_bpf.h
+++ b/reactos/drivers/net/npf/win_bpf.h
@@ -45,9 +45,11 @@
 /* BSD style release date */
 #define BPF_RELEASE 199606
 
+#ifndef _BSDTYPES_DEFINED
 typedef UCHAR u_char;
 typedef USHORT u_short;
 typedef UINT u_int;
+#endif
 typedef LONG bpf_int32;
 typedef ULONG bpf_u_int32;
 typedef ULONG u_int32;
diff --git a/reactos/lib/adns/src/internal.h b/reactos/lib/adns/src/internal.h
index 5aee1e13c4b..b1043536185 100644
--- a/reactos/lib/adns/src/internal.h
+++ b/reactos/lib/adns/src/internal.h
@@ -31,7 +31,7 @@
 #define ADNS_INTERNAL_H_INCLUDED
 
 #include "config.h"
-typedef unsigned char byte;
+/*typedef unsigned char byte;*/ /* FIXME: horrible kludge to avoid conflicts with an SDK type */
 
 #include <stdarg.h>
 #include <assert.h>
diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h
index 482bfaa2eff..bba01153590 100644
--- a/reactos/ntoskrnl/include/internal/kd.h
+++ b/reactos/ntoskrnl/include/internal/kd.h
@@ -108,24 +108,20 @@ typedef enum _KD_CONTINUE_TYPE
 
 typedef
 VOID
-STDCALL
-(*PKDP_INIT_ROUTINE)(struct _KD_DISPATCH_TABLE *DispatchTable,
+(STDCALL*PKDP_INIT_ROUTINE)(struct _KD_DISPATCH_TABLE *DispatchTable,
                      ULONG BootPhase);
 
 typedef
 VOID
-STDCALL
-(*PKDP_PRINT_ROUTINE)(PCH String);
+(STDCALL*PKDP_PRINT_ROUTINE)(PCH String);
 
 typedef
 VOID
-STDCALL
-(*PKDP_PROMPT_ROUTINE)(PCH String);
+(STDCALL*PKDP_PROMPT_ROUTINE)(PCH String);
 
 typedef
 KD_CONTINUE_TYPE
-STDCALL
-(*PKDP_EXCEPTION_ROUTINE)(PEXCEPTION_RECORD ExceptionRecord,
+(STDCALL*PKDP_EXCEPTION_ROUTINE)(PEXCEPTION_RECORD ExceptionRecord,
                           PCONTEXT Context,
                           PKTRAP_FRAME TrapFrame);
 
diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 74250f46ed1..2d6c7263f86 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -36,11 +36,10 @@
 #ifndef __USE_W32API
 
 typedef struct _KPROCESS *PKPROCESS;
+typedef struct _DISPATCHER_HEADER *PDISPATCHER_HEADER;
 
 #endif /* __USE_W32API */
 
-typedef struct _DISPATCHER_HEADER *PDISPATCHER_HEADER;
-
 typedef struct _HARDWARE_PTE_X86 {
     ULONG Valid             : 1;
     ULONG Write             : 1;
diff --git a/reactos/ntoskrnl/kd/wrappers/gdbstub.c b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
index 5574b2336c6..2b8c24a09b4 100644
--- a/reactos/ntoskrnl/kd/wrappers/gdbstub.c
+++ b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
@@ -132,20 +132,6 @@ typedef struct _CPU_REGISTER
 
 #define EIP_REGNO 8
 
-typedef
-VOID
-STDCALL_FUNC
-(*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine,
-                    PVOID StartContext);
-
-VOID
-STDCALL
-KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine,
-                PKSTART_ROUTINE StartRoutine,
-                PVOID StartContext,
-                BOOLEAN UserThread,
-                KTRAP_FRAME TrapFrame);
-
 static CPU_REGISTER GspRegisters[NUMREGS] =
 {
   { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Eax), FIELD_OFFSET (CONTEXT, Eax), TRUE },