Use typedefs_host.h header when building inflib for host

svn path=/trunk/; revision=28783

diff --git a/reactos/lib/inflib/builddep.h b/reactos/lib/inflib/builddep.h
index 9aa8423..8100b37 100644 (file)
--- a/reactos/lib/inflib/builddep.h
+++ b/reactos/lib/inflib/builddep.h
@@ -8,14 +8,13 @@
 
 /* Definitions native to the host on which we're building */
 
+#include <typedefs_host.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))
@@ -28,13 +27,6 @@
 #define INF_STATUS_BUFFER_OVERFLOW   E2BIG
 #define INF_SUCCESS(x) (0 == (x))
 
-typedef char CHAR, *PCHAR;
-typedef unsigned char UCHAR, *PUCHAR;
-typedef void VOID, *PVOID;
-typedef UCHAR BOOLEAN, *PBOOLEAN;
-#include <typedefs64.h>
-typedef LONG *PLONG;
-
 typedef char TCHAR, *PTCHAR, *PTSTR;
 #define _T(x) x
 #define _tcsicmp strcasecmp
@@ -45,11 +37,9 @@ typedef char TCHAR, *PTCHAR, *PTSTR;
 #define STRFMT "%s"
 
 #ifdef _MSC_VER
-#define strcasecmp stricmp
+#define strcasecmp _stricmp
 #endif
 
-extern ULONG DbgPrint(char *Fmt, ...);
-
 #else /* ! defined(INFLIB_HOST) */
 
 /* ReactOS definitions */

diff --git a/reactos/lib/inflib/infhost.h b/reactos/lib/inflib/infhost.h
index 64b4db7..3e17e7f 100644 (file)
--- a/reactos/lib/inflib/infhost.h
+++ b/reactos/lib/inflib/infhost.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <infcommon.h>
+#include "infcommon.h"
 
 extern int InfHostOpenBufferedFile(PHINF InfHandle,
                                    void *Buffer,

diff --git a/reactos/lib/inflib/infhostglue.c b/reactos/lib/inflib/infhostglue.c
deleted file mode 100644 (file)
index d889c28..0000000
--- a/reactos/lib/inflib/infhostglue.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * PROJECT:   .inf file parser
- * LICENSE:   GPL - See COPYING in the top level directory
- * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg@reactos.org>
- */
-
-/* INCLUDES *****************************************************************/
-
-#include "inflib.h"
-
-#define NDEBUG
-#include <debug.h>
-
-ULONG
-DbgPrint(char *Fmt, ...)
-{
-  va_list Args;
-
-  va_start(Args, Fmt);
-  vfprintf(stderr, Fmt, Args);
-  va_end(Args);
-
-  return 0;
-}
-
-/* EOF */

diff --git a/reactos/lib/inflib/inflib.mak b/reactos/lib/inflib/inflib.mak
index 9565253..2627d8f 100755 (executable)
--- a/reactos/lib/inflib/inflib.mak
+++ b/reactos/lib/inflib/inflib.mak
@@ -24,7 +24,6 @@ INFLIB_HOST_SOURCES = $(addprefix $(INFLIB_BASE_), \
        infput.c \
        infhostgen.c \
        infhostget.c \
-       infhostglue.c \
        infhostput.c \
        )
 
@@ -32,8 +31,8 @@ INFLIB_HOST_OBJECTS = \
        $(subst $(INFLIB_BASE), $(INFLIB_INT), $(INFLIB_HOST_SOURCES:.c=.o))
 
 INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
-  -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST -D_M_IX86 \
-  -I$(INFLIB_BASE) -Iinclude/reactos -DDBG
+  -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
+  -Iinclude/reactos
 
 $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
        $(ECHO_AR)
@@ -59,10 +58,6 @@ $(INFLIB_INT_)infhostget.o: $(INFLIB_BASE_)infhostget.c | $(INFLIB_INT)
        $(ECHO_CC)
        ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@
 
-$(INFLIB_INT_)infhostglue.o: $(INFLIB_BASE_)infhostglue.c | $(INFLIB_INT)
-       $(ECHO_CC)
-       ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@
-
 $(INFLIB_INT_)infhostput.o: $(INFLIB_BASE_)infhostput.c | $(INFLIB_INT)
        $(ECHO_CC)
        ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@