From 91fce48fa19606feab98e73109afb9fac9fe723a Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 16 Feb 2011 22:48:56 +0000 Subject: [PATCH] [HEADERS] - Remove include/reactos and include/reactos/wine include directories for host tools - Add include/host/wine directory - Move wpp.h to include/host/wine - Put a seperate config.h into include/host - Add a dummy debug.h and guiddef.h, wine/list.h, wine/port.h and wine/rpcfc.h that link to the original ones to include/host svn path=/branches/cmake-bringup/; revision=50763 --- CMakeLists.txt | 2 - include/host/config.h | 140 +++++++++++++++++++++++++++ include/host/debug.h | 6 ++ include/host/guiddef.h | 1 + include/host/wine/list.h | 1 + include/host/wine/port.h | 1 + include/host/wine/rpcfc.h | 1 + include/{reactos => host}/wine/wpp.h | 0 8 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 include/host/config.h create mode 100644 include/host/debug.h create mode 100644 include/host/guiddef.h create mode 100644 include/host/wine/list.h create mode 100644 include/host/wine/port.h create mode 100644 include/host/wine/rpcfc.h rename include/{reactos => host}/wine/wpp.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01a108a2592..90a8e2887de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,6 @@ if(NOT CMAKE_CROSSCOMPILING) ${REACTOS_SOURCE_DIR}/tools/unicode include include/host - include/reactos - include/reactos/wine ${REACTOS_BINARY_DIR}/include) add_subdirectory(tools) diff --git a/include/host/config.h b/include/host/config.h new file mode 100644 index 00000000000..8cc8d10fddb --- /dev/null +++ b/include/host/config.h @@ -0,0 +1,140 @@ +/* include/config.h. Generated by configure. */ +/* include/config.h.in. Generated from configure.ac by autoheader. */ + +#include "reactos/buildno.h" + +#define __WINE_CONFIG_H + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if the system has the type `mode_t'. */ +#define HAVE_MODE_T 1 + +/* Define to 1 if the system has the type `size_t'. */ +#define HAVE_SIZE_T 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if the system has the type `ssize_t'. */ +#define HAVE_SSIZE_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#if !defined(_WIN32) && !defined(_WIN64) +#define HAVE_STRCASECMP 1 +#endif + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#if !defined(_WIN32) && !defined(_WIN64) +#define HAVE_STRNCASECMP 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TIFFIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER + #define HAVE_SYS_TIME_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the timezone variable */ +#define HAVE_TIMEZONE 1 + +/* Define to 1 if you have the header file. */ +#if !defined(_MSC_VER) +#define HAVE_UNISTD_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define if we have va_copy */ +#define HAVE_VA_COPY 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `_snprintf' function. */ +#define HAVE__SNPRINTF 1 + +/* Define to 1 if you have the `_stricmp' function. */ +#if defined(_WIN32) || defined(_WIN64) +#define HAVE__STRICMP 1 +#endif + +/* Define to 1 if you have the `_strnicmp' function. */ +#if defined(_WIN32) || defined(_WIN64) +#define HAVE__STRNICMP 1 +#endif + +/* Define to 1 if you have the `_vsnprintf' function. */ +#define HAVE__VSNPRINTF 1 + +/* Define if we have __va_copy */ +#define HAVE___VA_COPY 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "ros-dev@reactos.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ReactOS" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "ReactOS" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION KERNEL_VERSION_STR + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the X Window System is missing or not being used. */ +#define X_DISPLAY_MISSING 1 + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 + +#if defined(_MSC_VER) +#define inline __inline +#endif diff --git a/include/host/debug.h b/include/host/debug.h new file mode 100644 index 00000000000..580665deb98 --- /dev/null +++ b/include/host/debug.h @@ -0,0 +1,6 @@ +#ifndef __WINE_DEBUG_H +#define __WINE_DEBUG_H + +/* This file is intentionally left blank */ + +#endif /* __WINE_DEBUG_H */ diff --git a/include/host/guiddef.h b/include/host/guiddef.h new file mode 100644 index 00000000000..74953a71549 --- /dev/null +++ b/include/host/guiddef.h @@ -0,0 +1 @@ +#include "../psdk/guiddef.h" diff --git a/include/host/wine/list.h b/include/host/wine/list.h new file mode 100644 index 00000000000..92cea5bec87 --- /dev/null +++ b/include/host/wine/list.h @@ -0,0 +1 @@ +#include "../../reactos/wine/list.h" diff --git a/include/host/wine/port.h b/include/host/wine/port.h new file mode 100644 index 00000000000..b5e4bc32be7 --- /dev/null +++ b/include/host/wine/port.h @@ -0,0 +1 @@ +#include "../../reactos/wine/port.h" diff --git a/include/host/wine/rpcfc.h b/include/host/wine/rpcfc.h new file mode 100644 index 00000000000..5f63c64169b --- /dev/null +++ b/include/host/wine/rpcfc.h @@ -0,0 +1 @@ +#include "../../reactos/wine/rpcfc.h" diff --git a/include/reactos/wine/wpp.h b/include/host/wine/wpp.h similarity index 100% rename from include/reactos/wine/wpp.h rename to include/host/wine/wpp.h -- 2.17.1