Author: jgardou Date: Wed Nov 3 18:15:51 2010 New Revision: 49461
URL: http://svn.reactos.org/svn/reactos?rev=49461&view=rev Log: [WINE/CONFIG] MSVC has no sys/time.h [DDK] Directly include <wingdi.h> [UNICODE] Fix build on msvc All tools now build with msvc.
Modified: branches/cmake-bringup/include/reactos/wine/config.h branches/cmake-bringup/include/reactos/wine/ddk/imm.h branches/cmake-bringup/tools/unicode/string.c
Modified: branches/cmake-bringup/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/wi... ============================================================================== --- branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] Wed Nov 3 18:15:51 2010 @@ -777,7 +777,9 @@ /* #undef HAVE_SYS_TIMES_H */
/* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 +#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
Modified: branches/cmake-bringup/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/wi... ============================================================================== --- branches/cmake-bringup/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/ddk/imm.h [iso-8859-1] Wed Nov 3 18:15:51 2010 @@ -2,7 +2,7 @@ #ifndef _WINE_IMM_H_ #define _WINE_IMM_H_
-#include <psdk/wingdi.h> +#include <wingdi.h>
#ifdef WINE_NO_UNICODE_MACROS # define WINELIB_NAME_AW(func) \
Modified: branches/cmake-bringup/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/stri... ============================================================================== --- branches/cmake-bringup/tools/unicode/string.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/string.c [iso-8859-1] Wed Nov 3 18:15:51 2010 @@ -23,7 +23,9 @@ #include <stdio.h> #include <string.h>
-#define WINE_UNICODE_INLINE /* nothing */ +#ifndef _MSC_VER + #define WINE_UNICODE_INLINE /* nothing */ +#endif #include "wine/unicode.h"
int strcmpiW( const WCHAR *str1, const WCHAR *str2 )