Fix Pelles C Win32 target compilation issues (b2f43089) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

ares/config-win32.h

+52 −18

Original line number	Diff line number	Diff line
		@@ -25,13 +25,18 @@
		/* ---------------------------------------------------------------- */

		/* Define if you have the <getopt.h> header file. */
		#if defined(__MINGW32__)
		#if defined(__MINGW32__) \|\| defined(__POCC__)
		#define HAVE_GETOPT_H 1
		#endif

		/* Define if you have the <limits.h> header file. */
		#define HAVE_LIMITS_H 1

		/* Define if you have the <process.h> header file. */
		#ifndef __SALFORDC__
		#define HAVE_PROCESS_H 1
		#endif

		/* Define if you have the <signal.h> header file. */
		#define HAVE_SIGNAL_H 1

		@@ -41,9 +46,6 @@
		/* Define if you have the <time.h> header file. */
		#define HAVE_TIME_H 1

		/* Define if you have the <process.h> header file. */
		#define HAVE_PROCESS_H 1

		/* Define if you have the <unistd.h> header file. */
		#if defined(__MINGW32__) \|\| defined(__WATCOMC__) \|\| defined(__LCC__) \|\| \
		defined(__POCC__)
		@@ -57,10 +59,14 @@
		#define HAVE_WINSOCK_H 1

		/* Define if you have the <winsock2.h> header file. */
		#ifndef __SALFORDC__
		#define HAVE_WINSOCK2_H 1
		#endif

		/* Define if you have the <ws2tcpip.h> header file. */
		#ifndef __SALFORDC__
		#define HAVE_WS2TCPIP_H 1
		#endif

		/* ---------------------------------------------------------------- */
		/* OTHER HEADER INFO */
		@@ -79,6 +85,9 @@
		/* FUNCTIONS */
		/* ---------------------------------------------------------------- */

		/* Define if you have the gethostname function. */
		#define HAVE_GETHOSTNAME 1

		/* Define if you have the ioctlsocket function. */
		#define HAVE_IOCTLSOCKET 1

		@@ -100,9 +109,6 @@
		/* Define if you have the strnicmp function. */
		#define HAVE_STRNICMP 1

		/* Define if you have the gethostname function. */
		#define HAVE_GETHOSTNAME 1

		/* Define if you have the recv function. */
		#define HAVE_RECV 1

		@@ -197,14 +203,16 @@

		/* Define ssize_t if it is not an available 'typedefed' type */
		#ifndef _SSIZE_T_DEFINED
		#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) \|\| defined(__POCC__) \|\| \
		# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) \|\| \
		defined(__POCC__) \|\| \
		defined(__MINGW32__)
		# elif defined(_WIN64)
		# define _SSIZE_T_DEFINED
		# define ssize_t __int64
		# else
		# define _SSIZE_T_DEFINED
		# define ssize_t int
		# endif
		#define _SSIZE_T_DEFINED
		#endif

		/* ---------------------------------------------------------------- */
		@@ -215,7 +223,9 @@
		#define HAVE_STRUCT_ADDRINFO 1

		/* Define this if you have struct sockaddr_storage */
		#ifndef __SALFORDC__
		#define HAVE_STRUCT_SOCKADDR_STORAGE 1
		#endif

		/* Define this if you have struct timeval */
		#define HAVE_STRUCT_TIMEVAL 1
		@@ -260,10 +270,25 @@
		# endif
		#endif

		/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */
		/* convoluted, compiler dependant and in some cases even build target dependat. */
		/* When no build target is specified Pelles C 5.00 and later default build
		target is Windows Vista. We override default target to be Windows 2000. */
		#if defined(__POCC__) && (__POCC__ >= 500)
		# ifndef _WIN32_WINNT
		# define _WIN32_WINNT 0x0500
		# endif
		# ifndef WINVER
		# define WINVER 0x0500
		# endif
		#endif

		/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is
		quite convoluted, compiler dependent and even build target dependent. */
		#if defined(HAVE_WS2TCPIP_H)
		# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
		# if defined(__POCC__)
		# define HAVE_FREEADDRINFO 1
		# define HAVE_GETADDRINFO 1
		# define HAVE_GETNAMEINFO 1
		# elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
		# define HAVE_FREEADDRINFO 1
		# define HAVE_GETADDRINFO 1
		# define HAVE_GETNAMEINFO 1
		@@ -274,6 +299,15 @@
		# endif
		#endif

		#if defined(__POCC__)
		# ifndef _MSC_VER
		# error Microsoft extensions /Ze compiler option is required
		# endif
		# ifndef __POCC__OLDNAMES
		# error Compatibility names /Go compiler option is required
		# endif
		#endif

		/* ---------------------------------------------------------------- */
		/* IPV6 COMPATIBILITY */
		/* ---------------------------------------------------------------- */

ares/setup.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,12 @@

		#endif /* HAVE_CONFIG_H */

		#ifdef __POCC__
		# include <sys/types.h>
		# include <unistd.h>
		# define ESRCH 3
		#endif

		/*
		* Recent autoconf versions define these symbols in ares_config.h. We don't
		* want them (since they collide with the libcurl ones when we build

lib/amigaos.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		@@ -72,4 +72,10 @@ BOOL amiga_init()
		ADD2EXIT(amiga_cleanup,-50);
		#endif

		#else /* __AMIGA__ */

		#ifdef __POCC__
		# pragma warn(disable:2024) /* Disable warning #2024: Empty input file */
		#endif

		#endif /* __AMIGA__ */

lib/config-win32.h

+52 −14

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		#define HAVE_LIMITS_H 1

		/* Define if you need the malloc.h header file even with stdlib.h */
		#ifndef __SALFORDC__
		#if !defined(__SALFORDC__) && !defined(__POCC__)
		#define NEED_MALLOC_H 1
		#endif

		@@ -82,7 +82,7 @@
		/* Define if you have the <sys/types.h> header file. */
		#define HAVE_SYS_TYPES_H 1

		/* Define if you have the <sys/utime.h> header file */
		/* Define if you have the <sys/utime.h> header file. */
		#ifndef __BORLANDC__
		#define HAVE_SYS_UTIME_H 1
		#endif
		@@ -108,11 +108,13 @@
		/* Define if you have the <winsock.h> header file. */
		#define HAVE_WINSOCK_H 1

		#ifndef __SALFORDC__
		/* Define if you have the <winsock2.h> header file. */
		#ifndef __SALFORDC__
		#define HAVE_WINSOCK2_H 1
		#endif

		/* Define if you have the <ws2tcpip.h> header file. */
		#ifndef __SALFORDC__
		#define HAVE_WS2TCPIP_H 1
		#endif

		@@ -315,14 +317,16 @@

		/* Define ssize_t if it is not an available 'typedefed' type */
		#ifndef _SSIZE_T_DEFINED
		#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) \|\| defined(__POCC__) \|\| \
		# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) \|\| \
		defined(__POCC__) \|\| \
		defined(__MINGW32__)
		# elif defined(_WIN64)
		# define _SSIZE_T_DEFINED
		# define ssize_t __int64
		# else
		# define _SSIZE_T_DEFINED
		# define ssize_t int
		# endif
		#define _SSIZE_T_DEFINED
		#endif

		/* ---------------------------------------------------------------- */
		@@ -437,11 +441,25 @@
		# endif
		#endif

		/* When no build target is specified Pelles C 5.00 and later default build
		target is Windows Vista. We override default target to be Windows 2000. */
		#if defined(__POCC__) && (__POCC__ >= 500)
		# ifndef _WIN32_WINNT
		# define _WIN32_WINNT 0x0500
		# endif
		# ifndef WINVER
		# define WINVER 0x0500
		# endif
		#endif

		/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is
		quite convoluted, compiler dependant and in some cases even build target
		dependant. */
		quite convoluted, compiler dependent and even build target dependent. */
		#if defined(HAVE_WS2TCPIP_H)
		# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
		# if defined(__POCC__)
		# define HAVE_FREEADDRINFO 1
		# define HAVE_GETADDRINFO 1
		# define HAVE_GETNAMEINFO 1
		# elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
		# define HAVE_FREEADDRINFO 1
		# define HAVE_GETADDRINFO 1
		# define HAVE_GETNAMEINFO 1
		@@ -452,6 +470,15 @@
		# endif
		#endif

		#if defined(__POCC__)
		# ifndef _MSC_VER
		# error Microsoft extensions /Ze compiler option is required
		# endif
		# ifndef __POCC__OLDNAMES
		# error Compatibility names /Go compiler option is required
		# endif
		#endif

		/* ---------------------------------------------------------------- */
		/* LARGE FILE SUPPORT */
		/* ---------------------------------------------------------------- */
		@@ -468,6 +495,10 @@
		# define USE_WIN32_LARGE_FILES
		#endif

		#if defined(__POCC__)
		# undef USE_WIN32_LARGE_FILES
		#endif

		#if !defined(USE_WIN32_LARGE_FILES) && !defined(USE_WIN32_SMALL_FILES)
		# define USE_WIN32_SMALL_FILES
		#endif
		@@ -491,6 +522,10 @@
		#define CURL_LDAP_WIN 1
		#endif

		#if defined(__POCC__) && defined(CURL_LDAP_WIN)
		# define CURL_DISABLE_LDAP 1
		#endif

		/* ---------------------------------------------------------------- */
		/* ADDITIONAL DEFINITIONS */
		/* ---------------------------------------------------------------- */
		@@ -510,5 +545,8 @@
		/* Name of package */
		#define PACKAGE "curl"

		#if defined(__POCC__)
		# define ENABLE_IPV6 1
		#endif

		#endif /* __LIB_CONFIG_WIN32_H */

lib/easy.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ static long init_flags;
		#define system_strdup strdup
		#endif

		#if defined(_MSC_VER) && defined(_DLL)
		#if defined(_MSC_VER) && defined(_DLL) && !defined(__POCC__)
		# pragma warning(disable:4232) /* MSVC extension, dllimport identity */
		#endif

		@@ -232,7 +232,7 @@ curl_strdup_callback Curl_cstrdup;
		curl_calloc_callback Curl_ccalloc;
		#endif

		#if defined(_MSC_VER) && defined(_DLL)
		#if defined(_MSC_VER) && defined(_DLL) && !defined(__POCC__)
		# pragma warning(default:4232) /* MSVC extension, dllimport identity */
		#endif