diff options
| -rw-r--r-- | lib/config-win32.h | 17 | ||||
| -rw-r--r-- | lib/config-win32ce.h | 5 | ||||
| -rw-r--r-- | lib/setup.h | 11 | ||||
| -rw-r--r-- | lib/share.h | 10 |
4 files changed, 39 insertions, 4 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index 9b3d531d7..600d28c8b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -37,7 +37,9 @@ #define HAVE_IO_H 1 /* Define if you have the <malloc.h> header file. */ +#ifndef __SALFORDC__ #define HAVE_MALLOC_H 1 +#endif /* Define if you have the <netdb.h> header file. */ /* #define HAVE_NETDB_H 1 */ @@ -45,6 +47,11 @@ /* Define if you have the <netinet/in.h> header file. */ /* #define HAVE_NETINET_IN_H 1 */ +/* Define if you have the <process.h> header file. */ +#ifndef __SALFORDC__ +#define HAVE_PROCESS_H 1 +#endif + /* Define if you have the <sgtty.h> header file. */ /* #define HAVE_SGTTY_H 1 */ @@ -98,11 +105,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. */ #define HAVE_WINSOCK2_H 1 /* Define if you have the <ws2tcpip.h> header file. */ #define HAVE_WS2TCPIP_H 1 +#endif /* ---------------------------------------------------------------- */ /* OTHER HEADER INFO */ @@ -246,8 +255,10 @@ #endif /* Define SIZEOF_CURL_OFF_T as computed by sizeof(curl_off_t) */ -/* Borland/PellesC lacks _lseeki64(), so we don't support >2GB files. */ -#if defined(__BORLANDC__) || defined(__POCC__) +/* Borland/PellesC/SalfordC lacks _lseeki64(), so we don't support + * >2GB files. + */ +#if defined(__BORLANDC__) || defined(__POCC__) || defined(__SALFORDC__) #define SIZEOF_CURL_OFF_T 4 #else #define SIZEOF_CURL_OFF_T 8 @@ -258,7 +269,9 @@ /* ---------------------------------------------------------------- */ /* Define this if you have struct sockaddr_storage */ +#ifndef __SALFORDC__ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 +#endif /* ---------------------------------------------------------------- */ /* COMPILER SPECIFIC */ diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 2ec147a91..5e9f6e4e1 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -54,6 +54,9 @@ /* Define if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 +/* Define if you have the <process.h> header file. */ +#define HAVE_PROCESS_H 1 + /* Define if you have the <sys/param.h> header file. */ /* #define HAVE_SYS_PARAM_H 1 */ @@ -277,7 +280,7 @@ #define PACKAGE "curl" /* ---------------------------------------------------------------- */ -/* WinCE */ +/* WinCE */ /* ---------------------------------------------------------------- */ #define CURL_DISABLE_FILE 1 diff --git a/lib/setup.h b/lib/setup.h index cad81fb45..13f210a8a 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -173,6 +173,17 @@ typedef unsigned char bool; #endif #endif +/* + * Salford-C cludge section (mostly borrowed from wxWidgets). + */ +#ifdef __SALFORDC__ + #pragma suppress 353 /* Possible nested comments */ + #pragma suppress 593 /* Define not used */ + #pragma suppress 61 /* enum has no name */ + #pragma suppress 106 /* unnamed, unused parameter */ + #include <clib.h> +#endif + #if defined(CURLDEBUG) && defined(HAVE_ASSERT_H) #define curlassert(x) assert(x) #else diff --git a/lib/share.h b/lib/share.h index 5f02f1aed..5cfe8c792 100644 --- a/lib/share.h +++ b/lib/share.h @@ -28,10 +28,18 @@ #include <curl/curl.h> #include "cookie.h" +/* SalfordC says "A structure member may not be volatile". Hence: + */ +#ifdef __SALFORDC__ +#define CURL_VOLATILE +#else +#define CURL_VOLATILE volatile +#endif + /* this struct is libcurl-private, don't export details */ struct Curl_share { unsigned int specifier; - volatile unsigned int dirty; + CURL_VOLATILE unsigned int dirty; curl_lock_function lockfunc; curl_unlock_function unlockfunc; |