From 59b422f5904e4a2d416fc969c4df5d1fb26691c9 Mon Sep 17 00:00:00 2001 From: James Benton Date: Mon, 18 Jun 2018 11:01:36 +0100 Subject: [PATCH] curl: Remove non-CafeOS platform specific stuff. --- include/curl/curl.h | 66 --------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/include/curl/curl.h b/include/curl/curl.h index a9d42fa..72841a0 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -34,79 +34,19 @@ #include "curlbuild.h" /* libcurl build definitions */ #include "curlrules.h" /* libcurl rules enforcement */ -/* - * Define WIN32 when build target is Win32 API - */ - -#if (defined(_WIN32) || defined(__WIN32__)) && \ - !defined(WIN32) && !defined(__SYMBIAN32__) -#define WIN32 -#endif - #include #include -#if defined(__FreeBSD__) && (__FreeBSD__ >= 2) -/* Needed for __FreeBSD_version symbol definition */ -#include -#endif - /* The include stuff here below is mainly for time_t! */ #include #include -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \ - !defined(__CYGWIN__) || defined(__MINGW32__) -#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H)) -/* The check above prevents the winsock2 inclusion if winsock.h already was - included, since they can't co-exist without problems */ -#include -#include -#endif -#else - -/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish - libc5-based Linux systems. Only include it on system that are known to - require it! */ -#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ - defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ - defined(ANDROID) || \ - (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) -#include -#endif - -#ifndef _WIN32_WCE -#include -#endif -#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__) -#include -#endif -#include -#endif - -#ifdef __BEOS__ -#include -#endif - #ifdef __cplusplus extern "C" { #endif typedef void CURL; -/* - * Decorate exportable functions for Win32 and Symbian OS DLL linking. - * This avoids using a .def file for building libcurl.dll. - */ -#if (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)) && \ - !defined(CURL_STATICLIB) -#if defined(BUILDING_LIBCURL) -#define CURL_EXTERN __declspec(dllexport) -#else -#define CURL_EXTERN __declspec(dllimport) -#endif -#else - #ifdef CURL_HIDDEN_SYMBOLS /* * This definition is used to make external definitions visible in the @@ -118,17 +58,11 @@ typedef void CURL; #else #define CURL_EXTERN #endif -#endif #ifndef curl_socket_typedef /* socket typedef */ -#ifdef WIN32 -typedef SOCKET curl_socket_t; -#define CURL_SOCKET_BAD INVALID_SOCKET -#else typedef int curl_socket_t; #define CURL_SOCKET_BAD -1 -#endif #define curl_socket_typedef #endif /* curl_socket_typedef */