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

svn path=/trunk/; revision=16034
This commit is contained in:
Alex Ionescu 2005-06-18 14:26:22 +00:00
parent eb4f82ce4d
commit 01251016ad
3 changed files with 11 additions and 58 deletions

View file

@ -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__ */

View file

@ -6,6 +6,12 @@
BOOLEAN STDCALL BOOLEAN STDCALL
HalAllProcessorsStarted(VOID); HalAllProcessorsStarted(VOID);
VOID
STDCALL
HalDisplayString (
IN PCHAR String
);
BOOLEAN STDCALL BOOLEAN STDCALL
HalBeginSystemInterrupt(ULONG Vector, HalBeginSystemInterrupt(ULONG Vector,
KIRQL Irql, KIRQL Irql,
@ -37,7 +43,7 @@ HalReportResourceUsage(VOID);
VOID VOID
STDCALL STDCALL
IoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IoAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock,
IN PSTRING NtDeviceName, IN PSTRING NtDeviceName,
OUT PUCHAR NtSystemPath, OUT PUCHAR NtSystemPath,
OUT PSTRING NtSystemPathString); OUT PSTRING NtSystemPathString);

View file

@ -116,8 +116,6 @@ typedef float *PFLOAT;
typedef wchar_t *PWCH; typedef wchar_t *PWCH;
typedef unsigned short *PWORD; typedef unsigned short *PWORD;
#include <msvcrt/crttypes.h> /* for definition of LONGLONG, PLONGLONG etc */
typedef const void *LPCVOID; typedef const void *LPCVOID;
typedef BYTE *LPBYTE, *PBYTE; typedef BYTE *LPBYTE, *PBYTE;
typedef BOOL *PBOOL; typedef BOOL *PBOOL;
@ -137,6 +135,10 @@ typedef ULONG WAIT_TYPE;
typedef USHORT CSHORT; typedef USHORT CSHORT;
typedef const wchar_t *PCWSTR; typedef const wchar_t *PCWSTR;
typedef char* PCSZ; 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); typedef DWORD STDCALL_FUNC (*PTHREAD_START_ROUTINE) (LPVOID);