Alexandre Julliard : configure: Don' t define _WIN64 on the command line to avoid trouble with system headers.
Module: wine Branch: master Commit: 9abd8852ddb5c4b01174f8c07e3d21b1c99989df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abd8852ddb5c4b01174f8c07e... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 21:29:23 2006 +0200 configure: Don't define _WIN64 on the command line to avoid trouble with system headers. --- configure | 31 ------------------------------- configure.ac | 3 +-- include/msvcrt/direct.h | 4 ++++ include/msvcrt/malloc.h | 4 ++++ include/msvcrt/mbstring.h | 4 ++++ include/msvcrt/search.h | 4 ++++ include/msvcrt/stddef.h | 4 ++++ include/msvcrt/stdio.h | 4 ++++ include/msvcrt/string.h | 10 ++++++---- include/msvcrt/sys/types.h | 4 ++++ include/msvcrt/time.h | 4 ++++ include/msvcrt/wchar.h | 4 ++++ 12 files changed, 43 insertions(+), 37 deletions(-) diff --git a/configure b/configure index 431e36b..adf498d 100755 --- a/configure +++ b/configure @@ -23497,37 +23497,6 @@ if test $ac_cv_cpp_def___x86_64__ = yes; CFLAGS="$CFLAGS -D__x86_64__" LINTFLAGS="$LINTFLAGS -D__x86_64__" fi - - { echo "$as_me:$LINENO: checking whether we need to define _WIN64" >&5 -echo $ECHO_N "checking whether we need to define _WIN64... $ECHO_C" >&6; } -if test "${ac_cv_cpp_def__WIN64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef _WIN64 -yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - ac_cv_cpp_def__WIN64=yes -else - ac_cv_cpp_def__WIN64=no -fi -rm -f conftest* - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cpp_def__WIN64" >&5 -echo "${ECHO_T}$ac_cv_cpp_def__WIN64" >&6; } -if test $ac_cv_cpp_def__WIN64 = yes; then - CFLAGS="$CFLAGS -D_WIN64" - LINTFLAGS="$LINTFLAGS -D_WIN64" -fi ;; *alpha*) { echo "$as_me:$LINENO: checking whether we need to define __ALPHA__" >&5 echo $ECHO_N "checking whether we need to define __ALPHA__... $ECHO_C" >&6; } diff --git a/configure.ac b/configure.ac index b9a5b24..5d43d53 100644 --- a/configure.ac +++ b/configure.ac @@ -1431,8 +1431,7 @@ dnl *** check for the need to define pla case $host_cpu in *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;; - *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) - WINE_CHECK_DEFINE([_WIN64]) ;; + *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;; *alpha*) WINE_CHECK_DEFINE([__ALPHA__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index bd05db9..167e7d7 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -26,6 +26,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _SIZE_T_DEFINED #ifdef _WIN64 typedef unsigned __int64 size_t; diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index eff45e8..8f904b3 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -38,6 +38,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _SIZE_T_DEFINED #ifdef _WIN64 typedef unsigned __int64 size_t; diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index f47a4c0..1da3213 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -27,6 +27,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _SIZE_T_DEFINED #ifdef _WIN64 typedef unsigned __int64 size_t; diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h index c3a2e50..413b697 100644 --- a/include/msvcrt/search.h +++ b/include/msvcrt/search.h @@ -27,6 +27,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _SIZE_T_DEFINED #ifdef _WIN64 typedef unsigned __int64 size_t; diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index d67b304..62bb850 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -23,6 +23,10 @@ #ifndef __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #ifndef __cplusplus diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index bc58de3..dfa983f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -19,6 +19,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + /* file._flag flags */ #define _IOREAD 0x0001 #define _IOWRT 0x0002 diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index cc0b25e..bf3994f 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -18,10 +18,12 @@ typedef unsigned short wchar_t; #endif #endif -#ifndef _MSC_VER -# ifndef __int64 -# define __int64 long long -# endif +#if !defined(_MSC_VER) && !defined(__int64) +#define __int64 long long +#endif + +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 #endif #ifndef _SIZE_T_DEFINED diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index abb05a3..53d5c6b 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -27,6 +27,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _DEV_T_DEFINED typedef unsigned int _dev_t; #define _DEV_T_DEFINED diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index b2caa03..0fbf1df 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -34,6 +34,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + #ifndef _SIZE_T_DEFINED #ifdef _WIN64 typedef unsigned __int64 size_t; diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 81982e2..f07db62 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -39,6 +39,10 @@ #if !defined(_MSC_VER) && !defined(__int #define __int64 long long #endif +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + typedef int mbstate_t; #ifndef _SIZE_T_DEFINED
participants (1)
-
Alexandre Julliard