Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use typedefs_host.h header when building inflib for host

Browse source 
svn path=/trunk/; revision=28783
This commit is contained in:
Hervé Poussineau 2007-09-02 19:23:43 +00:00
parent 93b424d064
commit 056f1f734f
4 changed files with 6 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/lib/inflib/builddep.h
View file

@ -8,14 +8,13 @@
/* Definitions native to the host on which we're building */ /* Definitions native to the host on which we're building */
#include <typedefs_host.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#define FALSE 0
#define TRUE 1
#define FREE(Area) free(Area) #define FREE(Area) free(Area)
#define MALLOC(Size) malloc(Size) #define MALLOC(Size) malloc(Size)
#define ZEROMEMORY(Area, Size) memset((Area), '\0', (Size)) #define ZEROMEMORY(Area, Size) memset((Area), '\0', (Size))
@ -28,13 +27,6 @@
#define INF_STATUS_BUFFER_OVERFLOW E2BIG #define INF_STATUS_BUFFER_OVERFLOW E2BIG
#define INF_SUCCESS(x) (0 == (x)) #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; typedef char TCHAR, *PTCHAR, *PTSTR;
#define _T(x) x #define _T(x) x
#define _tcsicmp strcasecmp #define _tcsicmp strcasecmp
@ -45,11 +37,9 @@ typedef char TCHAR, *PTCHAR, *PTSTR;
#define STRFMT "%s" #define STRFMT "%s"
#ifdef _MSC_VER #ifdef _MSC_VER
#define strcasecmp stricmp #define strcasecmp _stricmp
#endif #endif
extern ULONG DbgPrint(char *Fmt, ...);
#else /* ! defined(INFLIB_HOST) */ #else /* ! defined(INFLIB_HOST) */
/* ReactOS definitions */ /* ReactOS definitions */

2
reactos/lib/inflib/infhost.h
View file

@ -13,7 +13,7 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <infcommon.h> #include "infcommon.h"
extern int InfHostOpenBufferedFile(PHINF InfHandle, extern int InfHostOpenBufferedFile(PHINF InfHandle,
void *Buffer, void *Buffer,

26
reactos/lib/inflib/infhostglue.c
View file

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

9
reactos/lib/inflib/inflib.mak
View file

@ -24,7 +24,6 @@ INFLIB_HOST_SOURCES = $(addprefix $(INFLIB_BASE_), \
infput.c \ infput.c \
infhostgen.c \ infhostgen.c \
infhostget.c \ infhostget.c \
infhostglue.c \
infhostput.c \ infhostput.c \
) )
@ -32,8 +31,8 @@ INFLIB_HOST_OBJECTS = \
$(subst $(INFLIB_BASE), $(INFLIB_INT), $(INFLIB_HOST_SOURCES:.c=.o)) $(subst $(INFLIB_BASE), $(INFLIB_INT), $(INFLIB_HOST_SOURCES:.c=.o))
INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST -D_M_IX86 \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
-I$(INFLIB_BASE) -Iinclude/reactos -DDBG -Iinclude/reactos
$(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
$(ECHO_AR) $(ECHO_AR)
@ -59,10 +58,6 @@ $(INFLIB_INT_)infhostget.o: $(INFLIB_BASE_)infhostget.c | $(INFLIB_INT)
$(ECHO_CC) $(ECHO_CC)
${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ ${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) $(INFLIB_INT_)infhostput.o: $(INFLIB_BASE_)infhostput.c | $(INFLIB_INT)
$(ECHO_CC) $(ECHO_CC)
${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@