Author: hpoussin Date: Sun Sep 2 23:23:43 2007 New Revision: 28783
URL: http://svn.reactos.org/svn/reactos?rev=28783&view=rev Log: Use typedefs_host.h header when building inflib for host
Removed: trunk/reactos/lib/inflib/infhostglue.c Modified: trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/infhost.h trunk/reactos/lib/inflib/inflib.mak
Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=2... ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sun Sep 2 23:23:43 2007 @@ -8,13 +8,12 @@
/* 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) @@ -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,10 +37,8 @@ #define STRFMT "%s"
#ifdef _MSC_VER -#define strcasecmp stricmp +#define strcasecmp _stricmp #endif - -extern ULONG DbgPrint(char *Fmt, ...);
#else /* ! defined(INFLIB_HOST) */
Modified: trunk/reactos/lib/inflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhost.h?rev=28... ============================================================================== --- trunk/reactos/lib/inflib/infhost.h (original) +++ trunk/reactos/lib/inflib/infhost.h Sun Sep 2 23:23:43 2007 @@ -13,7 +13,7 @@ extern "C" { #endif /* __cplusplus */
-#include <infcommon.h> +#include "infcommon.h"
extern int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer,
Removed: trunk/reactos/lib/inflib/infhostglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostglue.c?re... ============================================================================== --- trunk/reactos/lib/inflib/infhostglue.c (original) +++ trunk/reactos/lib/inflib/infhostglue.c (removed) @@ -1,26 +1,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 */
Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=2... ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Sun Sep 2 23:23:43 2007 @@ -24,7 +24,6 @@ infput.c \ infhostgen.c \ infhostget.c \ - infhostglue.c \ infhostput.c \ )
@@ -32,8 +31,8 @@ $(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 @@ $(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 $@