- DBGKD_WAIT_STATE_CHANGE64 is used in KD protocol 5, not number 6 that we use. Proto...

[reactos.git] / reactos / lib / inflib / builddep.h

diff --git a/reactos/lib/inflib/builddep.h b/reactos/lib/inflib/builddep.h
index d4c9005..8c38864 100644 (file)
--- a/reactos/lib/inflib/builddep.h
+++ b/reactos/lib/inflib/builddep.h
@@ -8,18 +8,17 @@
 
 /* Definitions native to the host on which we're building */
 
+#include <host/typedefs.h>
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 
-#define FALSE 0
-#define TRUE  1
-
 #define FREE(Area) free(Area)
-#define MALLOC(Size) malloc(Size)
-#define ZEROMEMORY(Area, Size) memset((Area), '\0', (Size))
-#define MEMCPY(Dest, Src, Size) memcpy((Dest), (Src), (Size))
+#define MALLOC(Size) malloc((size_t)(Size))
+#define ZEROMEMORY(Area, Size) memset((Area), '\0', (size_t)(Size))
+#define MEMCPY(Dest, Src, Size) memcpy((Dest), (Src), (size_t)(Size))
 
 #define INF_STATUS_SUCCESS           0
 #define INF_STATUS_NO_MEMORY         ENOMEM
@@ -28,14 +27,9 @@
 #define INF_STATUS_BUFFER_OVERFLOW   E2BIG
 #define INF_SUCCESS(x) (0 == (x))
 
-typedef char CHAR, *PCHAR;
-typedef unsigned char UCHAR, *PUCHAR;
-typedef long LONG, *PLONG;
-typedef unsigned long ULONG, *PULONG;
-typedef void VOID, *PVOID;
-typedef UCHAR BOOLEAN, *PBOOLEAN;
-
 typedef char TCHAR, *PTCHAR, *PTSTR;
+typedef const TCHAR *PCTSTR;
+
 #define _T(x) x
 #define _tcsicmp strcasecmp
 #define _tcslen strlen
@@ -45,22 +39,20 @@ typedef char TCHAR, *PTCHAR, *PTSTR;
 #define STRFMT "%s"
 
 #ifdef _MSC_VER
-#define strcasecmp stricmp
+#define strcasecmp _stricmp
 #endif
 
-extern unsigned long DbgPrint(char *Fmt, ...);
-
 #else /* ! defined(INFLIB_HOST) */
 
 /* ReactOS definitions */
 
 #define UNICODE
 #define _UNICODE
-#include <tchar.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
+#include <tchar.h>
 
 extern PVOID InfpHeap;
 
@@ -80,6 +72,4 @@ extern PVOID InfpHeap;
 
 #endif /* INFLIB_HOST */
 
-typedef const TCHAR *PCTSTR;
-
 /* EOF */