Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Create a new "include/host" directory for host-only includes.

Browse source 
- Copy the "pshpack*.h", "poppack.h" and "typedefs_host.h" (renamed to "typedefs.h") files to this directory
- Modify the Makefiles of cmlib_host, inflib_host, mkhive, unicode, wmc and wrc to remove the "include/psdk" dependency
- Remove the inclusion of "ntstatus.h" in cmlib_host and mkhive

svn path=/trunk/; revision=29042
This commit is contained in:
Colin Finck 2007-09-14 18:55:43 +00:00
parent 256cab14c1
commit 0429c9f223
19 changed files with 98 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/include/host/poppack.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RC_INVOKED
#if ( _MSC_VER >= 800 )
#pragma warning(disable:4103)
#endif // _MSC_VER
# if ( __FreeBSD__ == 5 )
# pragma pack(4)
# else
# pragma pack(pop)
# endif // __FreeBSD__
#endif // RC_INVOKED

10
reactos/include/host/pshpack1.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RC_INVOKED
#if ( _MSC_VER >= 800 )
#pragma warning(disable:4103)
#endif // _MSC_VER
# if ( __FreeBSD__ == 5 )
# pragma pack(1)
# else
# pragma pack(push,1)
# endif // __FreeBSD__
#endif // RC_INVOKED

10
reactos/include/host/pshpack2.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RC_INVOKED
#if ( _MSC_VER >= 800 )
#pragma warning(disable:4103)
#endif // _MSC_VER
# if ( __FreeBSD__ == 5 )
# pragma pack(2)
# else
# pragma pack(push,2)
# endif // __FreeBSD__
#endif // RC_INVOKED

10
reactos/include/host/pshpack4.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RC_INVOKED
#if ( _MSC_VER >= 800 )
#pragma warning(disable:4103)
#endif // _MSC_VER
# if ( __FreeBSD__ == 5 )
# pragma pack(4)
# else
# pragma pack(push,4)
# endif // __FreeBSD__
#endif // RC_INVOKED

10
reactos/include/host/pshpack8.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RC_INVOKED
#if ( _MSC_VER >= 800 )
#pragma warning(disable:4103)
#endif // _MSC_VER
# if ( __FreeBSD__ == 5 )
# pragma pack(8)
# else
# pragma pack(push,8)
# endif // __FreeBSD__
#endif // RC_INVOKED

10
reactos/include/host/pshpck16.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RC_INVOKED
#if ( _MSC_VER >= 800 )
#pragma warning(disable:4103)
#endif // _MSC_VER
# if ( __FreeBSD__ == 5 )
# pragma pack(16)
# else
# pragma pack(push,16)
# endif // __FreeBSD__
#endif // RC_INVOKED

2
reactos/include/reactos/typedefs_host.h → reactos/include/host/typedefs.h
View file

@ -1,7 +1,7 @@
/*
PROJECT: ReactOS
LICENSE: GPL v2 or any later version
FILE: include/reactos/typedefs_host.h
FILE: include/host/typedefs.h
PURPOSE: Type definitions and useful macros for host tools
COPYRIGHT: Copyright 2007 Hervé Poussineau
*/

14
reactos/lib/cmlib/cmlib.h
View file

@ -9,10 +9,20 @@
#define CMLIB_H
#ifdef CMLIB_HOST
#include <typedefs_host.h>
#include <host/typedefs.h>
#include <stdio.h>
#include <string.h>
#include <ntstatus.h>
// Definitions copied from <ntstatus.h>
// We only want to include host headers, so we define them manually
#define STATUS_SUCCESS ((NTSTATUS)0x00000000)
#define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002)
#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017)
#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A)
#define STATUS_REGISTRY_CORRUPT ((NTSTATUS)0xC000014C)
#define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C)
#define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009)
#endif
#ifndef _TYPEDEFS_HOST_H

2
reactos/lib/cmlib/cmlib.mak
View file

@ -31,7 +31,7 @@ CMLIB_HOST_OBJECTS = \
$(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o))
CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \
-I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk \
-I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \
-DCMLIB_HOST
$(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)

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

@ -8,7 +8,7 @@
/* Definitions native to the host on which we're building */
#include <typedefs_host.h>
#include <host/typedefs.h>
#include <stdarg.h>
#include <stdio.h>

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

@ -32,7 +32,7 @@ INFLIB_HOST_OBJECTS = \
INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
-Iinclude/reactos -Iinclude/psdk
-Iinclude/reactos -Iinclude
$(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
$(ECHO_AR)

15
reactos/tools/mkhive/mkhive.h
View file

@ -30,8 +30,19 @@
#include <stdio.h>
#include <stdlib.h>
#include <typedefs_host.h>
#include <ntstatus.h>
#include <host/typedefs.h>
// Definitions copied from <ntstatus.h>
// We only want to include host headers, so we define them manually
#define STATUS_SUCCESS ((NTSTATUS)0x00000000)
#define STATUS_UNSUCCESSFUL ((NTSTATUS)0xC0000001)
#define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002)
#define STATUS_INVALID_PARAMETER ((NTSTATUS)0xC000000D)
#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017)
#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009A)
#define STATUS_OBJECT_NAME_NOT_FOUND ((NTSTATUS)0xC0000034)
#define STATUS_INVALID_PARAMETER_2 ((NTSTATUS)0xC00000F0)
#define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005)
NTSTATUS NTAPI
RtlAnsiStringToUnicodeString(

2
reactos/tools/mkhive/mkhive.mak
View file

@ -31,7 +31,7 @@ MKHIVE_OBJECTS = \
$(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o))
MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
-DMKHIVE_HOST -Iinclude/reactos -Iinclude/psdk -g3
-DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3
MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

2
reactos/tools/unicode/unicode.mak
View file

@ -96,7 +96,7 @@ UNICODE_OBJECTS = \
UNICODE_HOST_CFLAGS = \
-D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \
-I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk -Iinclude/reactos \
-I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \
$(TOOLS_CFLAGS)
.PHONY: unicode

2
reactos/tools/unicode/wine/unicode.h
View file

@ -22,7 +22,7 @@
#define __WINE_UNICODE_H
#include <stdarg.h>
#include <typedefs_host.h>
#include <host/typedefs.h>
// Definitions copied from <winnls.h>
// We only want to include host headers, so we define them manually

2
reactos/tools/wmc/wmc.mak
View file

@ -34,7 +34,7 @@ WMC_OBJECTS = \
WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \
-D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \
-Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \
-Iinclude/reactos/wine -Iinclude/reactos -Iinclude \
-I$(INTERMEDIATE_)/include
WMC_HOST_LFLAGS = $(TOOLS_LFLAGS)

2
reactos/tools/wmc/wmctypes.h
View file

@ -22,7 +22,7 @@
#define __WMC_WMCTYPES_H
#include <stdarg.h>
#include <typedefs_host.h>
#include <host/typedefs.h>
/* Byteordering defines */
#define WMC_BO_NATIVE 0x00

2
reactos/tools/wrc/wrc.mak
View file

@ -57,7 +57,7 @@ WRC_OBJECTS = \
WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \
-D__USE_W32API -DWINE_UNICODE_API= \
-I$(UNICODE_BASE) -I$(WPP_BASE) \
-Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \
-Iinclude/reactos/wine -Iinclude/reactos -Iinclude \
-I$(INTERMEDIATE_)include
WRC_HOST_LFLAGS = $(TOOLS_LFLAGS)

6
reactos/tools/wrc/wrcrostypes.h
View file

@ -9,7 +9,7 @@
#ifndef _WRC_ROSTYPES_H
#define _WRC_ROSTYPES_H
#include <typedefs_host.h>
#include <host/typedefs.h>
#include <string.h>
// Definitions copied from various <win....h> files
@ -159,7 +159,7 @@
#define SUBLANG_SERBIAN_CYRILLIC 0x03
#define SUBLANG_UZBEK_CYRILLIC 0x02
#include <pshpack2.h>
#include <host/pshpack2.h>
typedef struct tagBITMAPFILEHEADER {
WORD bfType;
DWORD bfSize;
@ -167,7 +167,7 @@ typedef struct tagBITMAPFILEHEADER {
WORD bfReserved2;
DWORD bfOffBits;
} BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER;
#include <poppack.h>
#include <host/poppack.h>
typedef int FXPT2DOT30;
typedef struct tagCIEXYZ {