From 6882b4020e77e637021e4a9ddf08d7d62de885a8 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 14 May 2008 19:42:17 +0000 Subject: [PATCH] Improve toolchain detection for WinCE cross compilation: When cross compiling WinCE with the arm-wince-cegcc-gcc C compiler symbol __CEGCC__ is defined and the unix-like compatibility layer is used. For our purposes this is not a native Windows build. When cross compiling WinCE with the arm-wince-mingw32ce-gcc C compiler symbol __MINGW32CE__ is defined and the unix-like compatibility layer is not used. For our purposes this _is_ a native Windows build. --- acinclude.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0ee7adf4..32ff1cb1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -14,7 +14,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [ #endif #include ],[ -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(__CEGCC__) HAVE_WINDOWS_H shall not be defined. #else int dummy=2*WINVER; @@ -50,7 +50,7 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([ ],[ -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__MINGW32CE__) int dummy=1; #else Not a native Windows build target. @@ -88,7 +88,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [ #include #include ],[ -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(__CEGCC__) HAVE_WINSOCK_H shall not be defined. #else int dummy=WSACleanup(); @@ -125,7 +125,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [ #include #include ],[ -#if defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__) HAVE_WINSOCK2_H shall not be defined. #else int dummy=2*IPPROTO_ESP; @@ -163,7 +163,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [ #include #include ],[ -#if defined(__CYGWIN__) || defined(_WIN32_WCE) +#if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__) HAVE_WS2TCPIP_H shall not be defined. #else int dummy=2*IP_PKTINFO;