Remove weird header and add a missing prototype in halfuncs.h

svn path=/trunk/; revision=16034

diff --git a/reactos/include/msvcrt/crttypes.h b/reactos/include/msvcrt/crttypes.h
deleted file mode 100644 (file)
index e8e0663..0000000
--- a/reactos/include/msvcrt/crttypes.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            include/msvcrt/crttypes.h
- * PURPOSE:         
- * PROGRAMMER:      
- * UPDATE HISTORY: 
- *                
- */
-
-#ifndef __CRT_TYPES__
-#define __CRT_TYPES__
-
-
-#ifdef  __GNUC__
-
-/*
-typedef long long LONGLONG;
-typedef unsigned long long ULONGLONG;
-typedef long long *PLONGLONG;
-typedef unsigned long long *PULONGLONG;
-*/
-
-#define HAVE_LONGLONG
-#define LONGLONG_DEFINED
-#define LONGLONG    long long
-#define ULONGLONG   unsigned long long
-#define PLONGLONG   long long *
-#define PULONGLONG  unsigned long long *
-
-#else /*__GNUC__*/
-
-#define LONGLONG_DEFINED
-#define LONGLONG    __int64
-#define ULONGLONG   unsigned __int64
-#define PLONGLONG   __int64*
-#define PULONGLONG  unsigned __int64*
-#define __attribute__(a)
-#define __volatile
-
-#define inline __inline
-#define __asm__ #error
-#define __volatile__(a)
-#define __attribute__(a)
-#if 0
-/* TMN: What on earth do these structures do in a user-mode header?! */
-struct _KTHREAD { int foobar; };
-struct _ETHREAD { int foobar; };
-struct _EPROCESS { int foobar; };
-#endif
-
-#endif /*__GNUC__*/
-
-
-#endif /* __CRT_TYPES__ */

diff --git a/reactos/include/ntos/halfuncs.h b/reactos/include/ntos/halfuncs.h
index 15d2876..66eee88 100755 (executable)
--- a/reactos/include/ntos/halfuncs.h
+++ b/reactos/include/ntos/halfuncs.h
@@ -6,6 +6,12 @@
 BOOLEAN STDCALL
 HalAllProcessorsStarted(VOID);
 
+VOID
+STDCALL
+HalDisplayString (
+    IN PCHAR String
+);
+
 BOOLEAN STDCALL
 HalBeginSystemInterrupt(ULONG Vector,
   KIRQL Irql,
@@ -37,7 +43,7 @@ HalReportResourceUsage(VOID);
 
 VOID
 STDCALL
-IoAssignDriveLetters(IN        PLOADER_PARAMETER_BLOCK LoaderBlock,
+IoAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock,
   IN  PSTRING NtDeviceName,
   OUT PUCHAR NtSystemPath,
   OUT PSTRING NtSystemPathString);

diff --git a/reactos/include/ntos/types.h b/reactos/include/ntos/types.h
index c74fc21..2f0d11d 100644 (file)
--- a/reactos/include/ntos/types.h
+++ b/reactos/include/ntos/types.h
@@ -116,8 +116,6 @@ typedef float *PFLOAT;
 typedef wchar_t *PWCH;
 typedef unsigned short *PWORD;
 
-#include <msvcrt/crttypes.h> /* for definition of LONGLONG, PLONGLONG etc */
-
 typedef const void *LPCVOID;
 typedef BYTE *LPBYTE, *PBYTE;
 typedef BOOL *PBOOL;
@@ -137,6 +135,10 @@ typedef ULONG WAIT_TYPE;
 typedef USHORT CSHORT;
 typedef const wchar_t *PCWSTR;
 typedef char* PCSZ;
+typedef long long LONGLONG;
+typedef LONGLONG *PLONGLONG;
+typedef unsigned long long ULONGLONG;
+typedef ULONGLONG *PULONGLONG;
 
 typedef DWORD STDCALL_FUNC (*PTHREAD_START_ROUTINE) (LPVOID);