Author: tkreuzer
Date: Wed Feb 16 22:48:56 2011
New Revision: 50763
URL:
http://svn.reactos.org/svn/reactos?rev=50763&view=rev
Log:
[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
Added:
branches/cmake-bringup/include/host/config.h (with props)
branches/cmake-bringup/include/host/debug.h (with props)
branches/cmake-bringup/include/host/guiddef.h (with props)
branches/cmake-bringup/include/host/wine/ (with props)
branches/cmake-bringup/include/host/wine/list.h (with props)
branches/cmake-bringup/include/host/wine/port.h (with props)
branches/cmake-bringup/include/host/wine/rpcfc.h (with props)
branches/cmake-bringup/include/host/wine/wpp.h
- copied unchanged from r50761, branches/cmake-bringup/include/reactos/wine/wpp.h
Removed:
branches/cmake-bringup/include/reactos/wine/wpp.h
Modified:
branches/cmake-bringup/CMakeLists.txt
Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Feb 16 22:48:56 2011
@@ -46,8 +46,6 @@
${REACTOS_SOURCE_DIR}/tools/unicode
include
include/host
- include/reactos
- include/reactos/wine
${REACTOS_BINARY_DIR}/include)
add_subdirectory(tools)
Added: branches/cmake-bringup/include/host/config.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/conf…
==============================================================================
--- branches/cmake-bringup/include/host/config.h (added)
+++ branches/cmake-bringup/include/host/config.h [iso-8859-1] Wed Feb 16 22:48:56 2011
@@ -1,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 <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
+/* Define to 1 if you have the <inttypes.h> 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 <memory.h> 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 <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> 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 <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> 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 <tiffio.h> header file. */
+#define HAVE_TIFFIO_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#ifndef _MSC_VER
+ #define HAVE_SYS_TIME_H 1
+#endif
+
+/* Define to 1 if you have the <sys/types.h> 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 <unistd.h> header file. */
+#if !defined(_MSC_VER)
+#define HAVE_UNISTD_H 1
+#endif
+
+/* Define to 1 if you have the <utime.h> 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(a)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
Propchange: branches/cmake-bringup/include/host/config.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/include/host/debug.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/debu…
==============================================================================
--- branches/cmake-bringup/include/host/debug.h (added)
+++ branches/cmake-bringup/include/host/debug.h [iso-8859-1] Wed Feb 16 22:48:56 2011
@@ -1,0 +1,6 @@
+#ifndef __WINE_DEBUG_H
+#define __WINE_DEBUG_H
+
+/* This file is intentionally left blank */
+
+#endif /* __WINE_DEBUG_H */
Propchange: branches/cmake-bringup/include/host/debug.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/include/host/guiddef.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/guid…
==============================================================================
--- branches/cmake-bringup/include/host/guiddef.h (added)
+++ branches/cmake-bringup/include/host/guiddef.h [iso-8859-1] Wed Feb 16 22:48:56 2011
@@ -1,0 +1,1 @@
+#include "../psdk/guiddef.h"
Propchange: branches/cmake-bringup/include/host/guiddef.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/cmake-bringup/include/host/wine/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Feb 16 22:48:56 2011
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: branches/cmake-bringup/include/host/wine/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: branches/cmake-bringup/include/host/wine/
------------------------------------------------------------------------------
bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/cmake-bringup/include/host/wine/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Added: branches/cmake-bringup/include/host/wine/list.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/wine…
==============================================================================
--- branches/cmake-bringup/include/host/wine/list.h (added)
+++ branches/cmake-bringup/include/host/wine/list.h [iso-8859-1] Wed Feb 16 22:48:56 2011
@@ -1,0 +1,1 @@
+#include "../../reactos/wine/list.h"
Propchange: branches/cmake-bringup/include/host/wine/list.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/include/host/wine/port.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/wine…
==============================================================================
--- branches/cmake-bringup/include/host/wine/port.h (added)
+++ branches/cmake-bringup/include/host/wine/port.h [iso-8859-1] Wed Feb 16 22:48:56 2011
@@ -1,0 +1,1 @@
+#include "../../reactos/wine/port.h"
Propchange: branches/cmake-bringup/include/host/wine/port.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/include/host/wine/rpcfc.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/wine…
==============================================================================
--- branches/cmake-bringup/include/host/wine/rpcfc.h (added)
+++ branches/cmake-bringup/include/host/wine/rpcfc.h [iso-8859-1] Wed Feb 16 22:48:56
2011
@@ -1,0 +1,1 @@
+#include "../../reactos/wine/rpcfc.h"
Propchange: branches/cmake-bringup/include/host/wine/rpcfc.h
------------------------------------------------------------------------------
svn:eol-style = native
Removed: branches/cmake-bringup/include/reactos/wine/wpp.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w…
==============================================================================
--- branches/cmake-bringup/include/reactos/wine/wpp.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/reactos/wine/wpp.h (removed)
@@ -1,36 +1,0 @@
-/*
- * Exported functions of the Wine preprocessor
- *
- * Copyright 2002 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WPP_H
-#define __WINE_WPP_H
-
-#include <stdio.h>
-
-extern void wpp_add_define( const char *name, const char *value );
-extern void wpp_del_define( const char *name );
-extern void wpp_add_cmdline_define( const char *value );
-extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug );
-extern void wpp_set_pedantic( int on );
-extern void wpp_add_include_path( const char *path );
-extern char *wpp_find_include( const char *name, const char *parent_name );
-extern int wpp_parse( const char *input, FILE *output );
-extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name
);
-
-#endif /* __WINE_WPP_H */