Gisle's adjustments to allow building with lcc-win32

This commit is contained in:
Daniel Stenberg 2004-06-02 11:36:07 +00:00
parent a8827b1ed6
commit 938a72b2db
4 changed files with 15 additions and 7 deletions

View File

@ -52,11 +52,11 @@ extern "C" {
* platforms. We also provide a CURL_FORMAT_OFF_T define to use in *printf * platforms. We also provide a CURL_FORMAT_OFF_T define to use in *printf
* format strings when outputting a variable of type curl_off_t. * format strings when outputting a variable of type curl_off_t.
*/ */
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__LCC__)
/* MSVC */ /* MSVC */
typedef signed __int64 curl_off_t; typedef signed __int64 curl_off_t;
#define CURL_FORMAT_OFF_T "%I64d" #define CURL_FORMAT_OFF_T "%I64d"
#else /* MSC_VER */ #else /* _MSC_VER || __LCC__ */
#if (defined(__GNUC__) && defined(WIN32)) || defined(__WATCOMC__) #if (defined(__GNUC__) && defined(WIN32)) || defined(__WATCOMC__)
/* gcc on windows or Watcom */ /* gcc on windows or Watcom */
typedef long long curl_off_t; typedef long long curl_off_t;
@ -88,7 +88,7 @@ extern "C" {
#define CURL_FORMAT_OFF_T "%ld" #define CURL_FORMAT_OFF_T "%ld"
#endif #endif
#endif /* GCC or Watcom on Windows */ #endif /* GCC or Watcom on Windows */
#endif /* MSC_VER */ #endif /* _MSC_VER || __LCC__ */
#ifdef UNDEF_FILE_OFFSET_BITS #ifdef UNDEF_FILE_OFFSET_BITS
/* this was defined above for our checks, undefine it again */ /* this was defined above for our checks, undefine it again */
@ -327,7 +327,7 @@ typedef enum {
* platforms. * platforms.
*/ */
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \ #if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
defined(__HP_aCC) || defined(__BORLANDC__) defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__)
/* This compiler is believed to have an ISO compatible preprocessor */ /* This compiler is believed to have an ISO compatible preprocessor */
#define CURL_ISOCPP #define CURL_ISOCPP
#else #else

View File

@ -1,6 +1,9 @@
/* config.h. Generated automatically by configure. */ /* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */ /* config.h.in. Generated automatically from configure.in by autoheader. */
#ifndef __CONFIG_WIN32_H
#define __CONFIG_WIN32_H
/* Define if on AIX 3. /* Define if on AIX 3.
System headers sometimes define this. System headers sometimes define this.
We just want to avoid a redefinition error message. */ We just want to avoid a redefinition error message. */
@ -223,9 +226,12 @@
/************************************************* /*************************************************
* This section is for compiler specific defines.* * This section is for compiler specific defines.*
*************************************************/ *************************************************/
#if defined(MINGW32) || defined(__WATCOMC__) /* Borland and MS don't have this */ /* Borland and MS don't have this */
#if defined(MINGW32) || defined(__WATCOMC__) || defined(__LCC__)
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#endif #endif
#endif

View File

@ -261,7 +261,8 @@ typedef int curl_socket_t;
#error "ares does not yet support IPv6. Disable IPv6 or ares and rebuild" #error "ares does not yet support IPv6. Disable IPv6 or ares and rebuild"
#endif #endif
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(USE_ARES) #if defined(WIN32) && !defined(__CYGWIN__) && !defined(USE_ARES) && \
!defined(__LCC__) /* lcc-win32 doesn't have _beginthreadex() */
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
#define USE_THREADING_GETADDRINFO #define USE_THREADING_GETADDRINFO
#else #else

View File

@ -37,7 +37,8 @@
#endif #endif
#ifndef HAVE_GETTIMEOFDAY #ifndef HAVE_GETTIMEOFDAY
#if !defined(_WINSOCKAPI_) && !defined(__MINGW32__) && !defined(_AMIGASF) #if !defined(_WINSOCKAPI_) && !defined(__MINGW32__) && !defined(_AMIGASF) && \
!defined(__LCC__)
struct timeval { struct timeval {
long tv_sec; long tv_sec;
long tv_usec; long tv_usec;