curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-18 01:52:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: remove the final watcom references

Browse Source 
Follow-up to bbf8cae44d

We removed support for the watcom builds files back in September
2020. This removes all remaining watcom references and ifdefs.

Closes #8287
This commit is contained in:
Daniel Stenberg 2022-01-16 23:10:22 +01:00
parent 90dd1fc664
commit f6088822ce
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
9 changed files with 21 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/curl/curl.h
View File

@ -82,7 +82,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#if !defined(CURL_WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__) #if !defined(CURL_WIN32) && !defined(__VXWORKS__)
#include <sys/time.h> #include <sys/time.h>
#endif #endif

18
include/curl/system.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -98,22 +98,6 @@
# define CURL_SUFFIX_CURL_OFF_TU UL # define CURL_SUFFIX_CURL_OFF_TU UL
# define CURL_TYPEOF_CURL_SOCKLEN_T int # define CURL_TYPEOF_CURL_SOCKLEN_T int
#elif defined(__WATCOMC__)
# if defined(__386__)
# 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
# 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(__POCC__) #elif defined(__POCC__)
# if (__POCC__ < 280) # if (__POCC__ < 280)
# define CURL_TYPEOF_CURL_OFF_T long # define CURL_TYPEOF_CURL_OFF_T long

7
lib/config-dos.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -31,8 +31,6 @@
#define OS "MSDOS/djgpp" #define OS "MSDOS/djgpp"
#elif defined(__HIGHC__) #elif defined(__HIGHC__)
#define OS "MSDOS/HighC" #define OS "MSDOS/HighC"
#elif defined(__WATCOMC__)
#define OS "MSDOS/Watcom"
#else #else
#define OS "MSDOS/?" #define OS "MSDOS/?"
#endif #endif
@ -154,9 +152,6 @@
#define HAVE_TERMIOS_H 1 #define HAVE_TERMIOS_H 1
#define HAVE_VARIADIC_MACROS_GCC 1 #define HAVE_VARIADIC_MACROS_GCC 1
#elif defined(__WATCOMC__)
#define HAVE_STRCASECMP 1
#elif defined(__HIGHC__) #elif defined(__HIGHC__)
#define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TIME_H 1
#define strerror(e) strerror_s_((e)) #define strerror(e) strerror_s_((e))

24
lib/config-win32.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -124,8 +124,7 @@
#define HAVE_TIME_H 1 #define HAVE_TIME_H 1
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \ #if defined(__MINGW32__) || defined(__LCC__) || defined(__POCC__)
defined(__POCC__)
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#endif #endif
@ -246,7 +245,7 @@
#define HAVE_STRSTR 1 #define HAVE_STRSTR 1
/* Define if you have the strtoll function. */ /* Define if you have the strtoll function. */
#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__POCC__) || \ #if defined(__MINGW32__) || defined(__POCC__) || \
(defined(_MSC_VER) && (_MSC_VER >= 1800)) (defined(_MSC_VER) && (_MSC_VER >= 1800))
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#endif #endif
@ -328,9 +327,7 @@
/* Define if ssize_t is not an available 'typedefed' type. */ /* Define if ssize_t is not an available 'typedefed' type. */
#ifndef _SSIZE_T_DEFINED #ifndef _SSIZE_T_DEFINED
# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \ # if defined(__POCC__) || defined(__MINGW32__)
defined(__POCC__) || \
defined(__MINGW32__)
# elif defined(_WIN64) # elif defined(_WIN64)
# define _SSIZE_T_DEFINED # define _SSIZE_T_DEFINED
# define ssize_t __int64 # define ssize_t __int64
@ -440,7 +437,7 @@
#endif #endif
/* Define if the compiler supports the 'long long' data type. */ /* Define if the compiler supports the 'long long' data type. */
#if defined(__MINGW32__) || defined(__WATCOMC__) || \ #if defined(__MINGW32__) || \
(defined(_MSC_VER) && (_MSC_VER >= 1310)) || \ (defined(_MSC_VER) && (_MSC_VER >= 1310)) || \
(defined(__BORLANDC__) && (__BORLANDC__ >= 0x561)) (defined(__BORLANDC__) && (__BORLANDC__ >= 0x561))
#define HAVE_LONGLONG 1 #define HAVE_LONGLONG 1
@ -604,10 +601,6 @@ Vista
# define USE_WIN32_LARGE_FILES # define USE_WIN32_LARGE_FILES
#endif #endif
#if defined(__WATCOMC__) && !defined(USE_WIN32_LARGE_FILES)
# define USE_WIN32_LARGE_FILES
#endif
#if defined(__POCC__) #if defined(__POCC__)
# undef USE_WIN32_LARGE_FILES # undef USE_WIN32_LARGE_FILES
#endif #endif
@ -654,13 +647,6 @@ Vista
#define USE_WIN32_LDAP 1 #define USE_WIN32_LDAP 1
#endif #endif
#if defined(__WATCOMC__) && defined(USE_WIN32_LDAP)
#if __WATCOMC__ < 1280
#define WINBERAPI __declspec(cdecl)
#define WINLDAPAPI __declspec(cdecl)
#endif
#endif
#if defined(__POCC__) && defined(USE_WIN32_LDAP) #if defined(__POCC__) && defined(USE_WIN32_LDAP)
# define CURL_DISABLE_LDAP 1 # define CURL_DISABLE_LDAP 1
#endif #endif

8
lib/config-win32ce.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -103,7 +103,7 @@
#define HAVE_TIME_H 1 #define HAVE_TIME_H 1
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) #if defined(__MINGW32__) || defined(__LCC__)
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#endif #endif
@ -191,7 +191,7 @@
#define HAVE_STRSTR 1 #define HAVE_STRSTR 1
/* Define if you have the strtoll function. */ /* Define if you have the strtoll function. */
#if defined(__MINGW32__) || defined(__WATCOMC__) #if defined(__MINGW32__)
#define HAVE_STRTOLL 1 #define HAVE_STRTOLL 1
#endif #endif
@ -269,7 +269,7 @@
#define in_addr_t unsigned long #define in_addr_t unsigned long
/* Define ssize_t if it is not an available 'typedefed' type */ /* Define ssize_t if it is not an available 'typedefed' type */
#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) #if defined(__POCC__)
#elif defined(_WIN64) #elif defined(_WIN64)
#define ssize_t __int64 #define ssize_t __int64
#else #else

3
lib/mprintf.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1999 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1999 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -65,7 +65,6 @@
*/ */
#if (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)) || \ #if (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)) || \
(defined(__WATCOMC__) && defined(__386__)) || \
(defined(__POCC__) && defined(_MSC_VER)) || \ (defined(__POCC__) && defined(_MSC_VER)) || \
(defined(_WIN32_WCE)) || \ (defined(_WIN32_WCE)) || \
(defined(__MINGW32__)) || \ (defined(__MINGW32__)) || \

59
m4/curl-compilers.m4
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -51,7 +51,6 @@ AC_DEFUN([CURL_CHECK_COMPILER], [
CURL_CHECK_COMPILER_SGI_MIPS_C CURL_CHECK_COMPILER_SGI_MIPS_C
CURL_CHECK_COMPILER_SUNPRO_C CURL_CHECK_COMPILER_SUNPRO_C
CURL_CHECK_COMPILER_TINY_C CURL_CHECK_COMPILER_TINY_C
CURL_CHECK_COMPILER_WATCOM_C
# #
if test "$compiler_id" = "unknown"; then if test "$compiler_id" = "unknown"; then
cat <<_EOF 1>&2 cat <<_EOF 1>&2
@ -360,36 +359,6 @@ AC_DEFUN([CURL_CHECK_COMPILER_TINY_C], [
fi fi
]) ])
dnl CURL_CHECK_COMPILER_WATCOM_C
dnl -------------------------------------------------
dnl Verify if compiler being used is Watcom C.
AC_DEFUN([CURL_CHECK_COMPILER_WATCOM_C], [
AC_MSG_CHECKING([if compiler is Watcom C])
CURL_CHECK_DEF([__WATCOMC__], [], [silent])
if test "$curl_cv_have_def___WATCOMC__" = "yes"; then
AC_MSG_RESULT([yes])
CURL_CHECK_DEF([__UNIX__], [], [silent])
if test "$curl_cv_have_def___UNIX__" = "yes"; then
compiler_id="WATCOM_UNIX_C"
flags_dbg_yes="-g2"
flags_opt_all="-O0 -O1 -O2 -O3"
flags_opt_yes="-O2"
flags_opt_off="-O0"
else
compiler_id="WATCOM_WINDOWS_C"
flags_dbg_yes=""
flags_opt_all=""
flags_opt_yes=""
flags_opt_off=""
fi
else
AC_MSG_RESULT([no])
fi
])
dnl CURL_CONVERT_INCLUDE_TO_ISYSTEM dnl CURL_CONVERT_INCLUDE_TO_ISYSTEM
dnl ------------------------------------------------- dnl -------------------------------------------------
dnl Changes standard include paths present in CFLAGS dnl Changes standard include paths present in CFLAGS
@ -640,18 +609,6 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [
tmp_CFLAGS="$tmp_CFLAGS" tmp_CFLAGS="$tmp_CFLAGS"
;; ;;
# #
WATCOM_UNIX_C)
#
dnl Placeholder
tmp_CFLAGS="$tmp_CFLAGS"
;;
#
WATCOM_WINDOWS_C)
#
dnl Placeholder
tmp_CFLAGS="$tmp_CFLAGS"
;;
#
esac esac
# #
squeeze tmp_CPPFLAGS squeeze tmp_CPPFLAGS
@ -1176,20 +1133,6 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
fi fi
;; ;;
# #
WATCOM_UNIX_C)
#
if test "$want_warnings" = "yes"; then
dnl Issue all warnings
tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra"
fi
;;
#
WATCOM_WINDOWS_C)
#
dnl Placeholder
tmp_CFLAGS="$tmp_CFLAGS"
;;
#
esac esac
# #
squeeze tmp_CPPFLAGS squeeze tmp_CPPFLAGS

9
src/Makefile.inc
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -20,10 +20,9 @@
# #
########################################################################### ###########################################################################
# ./src/Makefile.inc # ./src/Makefile.inc
# Using the backslash as line continuation character might be problematic # Using the backslash as line continuation character might be problematic with
# with some make flavours, as Watcom's wmake showed us already. If we # some make flavours. If we ever want to change this in a portable manner then
# ever want to change this in a portable manner then we should consider # we should consider this idea :
# this idea (posted to the libcurl list by Adam Kellas):
# CSRC1 = file1.c file2.c file3.c # CSRC1 = file1.c file2.c file3.c
# CSRC2 = file4.c file5.c file6.c # CSRC2 = file4.c file5.c file6.c
# CSOURCES = $(CSRC1) $(CSRC2) # CSOURCES = $(CSRC1) $(CSRC2)

8
tests/testcurl.pl
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -151,7 +151,7 @@ if ($^O eq 'MSWin32' || $targetos) {
# If no target defined on Win32 lets assume vc # If no target defined on Win32 lets assume vc
$targetos = 'vc'; $targetos = 'vc';
} }
if ($targetos =~ /vc/ || $targetos =~ /borland/ || $targetos =~ /watcom/) { if ($targetos =~ /vc/ || $targetos =~ /borland/) {
$binext = '.exe'; $binext = '.exe';
$libext = '.lib'; $libext = '.lib';
} }
@ -175,7 +175,7 @@ if ($^O eq 'MSWin32' || $targetos) {
if (($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') && if (($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') &&
($targetos =~ /vc/ || $targetos =~ /mingw32/ || ($targetos =~ /vc/ || $targetos =~ /mingw32/ ||
$targetos =~ /borland/ || $targetos =~ /watcom/)) { $targetos =~ /borland/)) {
# Set these things only when building ON Windows and for Win32 platform. # Set these things only when building ON Windows and for Win32 platform.
# FOR Windows since we might be cross-compiling on another system. Non- # FOR Windows since we might be cross-compiling on another system. Non-
@ -546,8 +546,6 @@ if(!$make) {
} }
# force to 'nmake' for VC builds # force to 'nmake' for VC builds
$make = "nmake" if ($targetos =~ /vc/); $make = "nmake" if ($targetos =~ /vc/);
# force to 'wmake' for Watcom builds
$make = "wmake" if ($targetos =~ /watcom/);
logit "going with $make as make"; logit "going with $make as make";
# change to build dir # change to build dir