luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system.h: drop compilers lacking 64-bit integer type (Windows/MS-DOS)

Browse Source 
- DJGPP 1.x (including `__GO32__`) (MS-DOS)
  DJGPP 2.x support remains unchanged.
- Salford C (Windows)
- Turbo C (Windows 16-bit)
- Borland C++ < 5.2 (Windows 16-bit?)
- Pelles C < 2.8 (Windows)

These targets mapped `curl_off_t` to `long`. On Windows and MS-DOS
`long` is always 32-bit.

curl requires C compilers supporting 64-bit `curl_off_t` type since
835682661c #10597 (v8.0.0).

Also: drop remaining `__GO32__` and Salford C guards.

Closes #15957
This commit is contained in:
Viktor Szakats 2025-01-09 15:42:34 +01:00
parent 95658f9ca3
commit ccf43ce91d
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 18 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
include/curl/system.h
View File

@ -52,62 +52,24 @@
* *
*/ */
#if defined(__DJGPP__) || defined(__GO32__) #if defined(__DJGPP__)
# if defined(__DJGPP__) && (__DJGPP__ > 1) # define CURL_TYPEOF_CURL_OFF_T long long
# define CURL_TYPEOF_CURL_OFF_T long long # define CURL_FORMAT_CURL_OFF_T "lld"
# define CURL_FORMAT_CURL_OFF_T "lld" # define CURL_FORMAT_CURL_OFF_TU "llu"
# define CURL_FORMAT_CURL_OFF_TU "llu" # define CURL_SUFFIX_CURL_OFF_T LL
# define CURL_SUFFIX_CURL_OFF_T LL # define CURL_SUFFIX_CURL_OFF_TU ULL
# define CURL_SUFFIX_CURL_OFF_TU ULL
# else
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# endif
# define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__SALFORDC__)
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# define CURL_TYPEOF_CURL_SOCKLEN_T int # define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
# if (__BORLANDC__ < 0x520) # define CURL_TYPEOF_CURL_OFF_T __int64
# define CURL_TYPEOF_CURL_OFF_T long # define CURL_FORMAT_CURL_OFF_T "I64d"
# define CURL_FORMAT_CURL_OFF_T "ld" # define CURL_FORMAT_CURL_OFF_TU "I64u"
# define CURL_FORMAT_CURL_OFF_TU "lu" # define CURL_SUFFIX_CURL_OFF_T i64
# define CURL_SUFFIX_CURL_OFF_T L # define CURL_SUFFIX_CURL_OFF_TU ui64
# define CURL_SUFFIX_CURL_OFF_TU UL
# else
# define CURL_TYPEOF_CURL_OFF_T __int64
# define CURL_FORMAT_CURL_OFF_T "I64d"
# define CURL_FORMAT_CURL_OFF_TU "I64u"
# define CURL_SUFFIX_CURL_OFF_T i64
# define CURL_SUFFIX_CURL_OFF_TU ui64
# endif
# define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__TURBOC__)
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# define CURL_TYPEOF_CURL_SOCKLEN_T int # define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__POCC__) #elif defined(__POCC__)
# if (__POCC__ < 280) # if defined(_MSC_VER)
# define CURL_TYPEOF_CURL_OFF_T long
# define CURL_FORMAT_CURL_OFF_T "ld"
# define CURL_FORMAT_CURL_OFF_TU "lu"
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# elif defined(_MSC_VER)
# define CURL_TYPEOF_CURL_OFF_T __int64 # define CURL_TYPEOF_CURL_OFF_T __int64
# define CURL_FORMAT_CURL_OFF_T "I64d" # define CURL_FORMAT_CURL_OFF_T "I64d"
# define CURL_FORMAT_CURL_OFF_TU "I64u" # define CURL_FORMAT_CURL_OFF_TU "I64u"
@ -459,7 +421,7 @@
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \ #if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \ defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \ defined(__POCC__) || defined(__HIGHC__) || \
defined(__ILEC400__) defined(__ILEC400__)
/* 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

6
src/tool_doswin.c
View File

@ -550,8 +550,7 @@ static SANITIZEcode rename_if_reserved_dos(char **const sanitized,
return (*sanitized ? SANITIZE_ERR_OK : SANITIZE_ERR_OUT_OF_MEMORY); return (*sanitized ? SANITIZE_ERR_OK : SANITIZE_ERR_OUT_OF_MEMORY);
} }
#if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__)) #ifdef __DJGPP__
/* /*
* Disable program default argument globbing. We do it on our own. * Disable program default argument globbing. We do it on our own.
*/ */
@ -560,8 +559,7 @@ char **__crt0_glob_function(char *arg)
(void)arg; (void)arg;
return (char **)0; return (char **)0;
} }
#endif
#endif /* MSDOS && (__DJGPP__ || __GO32__) */
#ifdef _WIN32 #ifdef _WIN32

6
src/tool_doswin.h
View File

@ -41,11 +41,9 @@ typedef enum {
SANITIZEcode sanitize_file_name(char **const sanitized, const char *file_name, SANITIZEcode sanitize_file_name(char **const sanitized, const char *file_name,
int flags); int flags);
#if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__)) #ifdef __DJGPP__
char **__crt0_glob_function(char *arg); char **__crt0_glob_function(char *arg);
#endif
#endif /* MSDOS && (__DJGPP__ || __GO32__) */
#ifdef _WIN32 #ifdef _WIN32

2
src/tool_main.c
View File

@ -151,7 +151,7 @@ static CURLcode main_init(struct GlobalConfig *config)
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
#if defined(__DJGPP__) || defined(__GO32__) #ifdef __DJGPP__
/* stop stat() wasting time */ /* stop stat() wasting time */
_djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE; _djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE;
#endif #endif