summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMake/Platforms/WindowsCache.cmake4
-rw-r--r--CMakeLists.txt2
-rwxr-xr-xconfigure.ac1
-rw-r--r--lib/config-os400.h8
-rw-r--r--lib/config-plan9.h3
-rw-r--r--lib/config-riscos.h8
-rw-r--r--lib/config-vxworks.h5
-rw-r--r--lib/config-win32.h9
-rw-r--r--lib/config-win32ce.h11
-rw-r--r--lib/curl_config.h.cmake3
-rw-r--r--m4/curl-functions.m486
11 files changed, 7 insertions, 133 deletions
diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake
index 12cec52dc..e18399917 100644
--- a/CMake/Platforms/WindowsCache.cmake
+++ b/CMake/Platforms/WindowsCache.cmake
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, 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
@@ -89,8 +89,6 @@ if(NOT UNIX)
set(HAVE_INET_ADDR 1)
set(HAVE_INET_NTOA 1)
set(HAVE_INET_NTOA_R 0)
- set(HAVE_TCGETATTR 0)
- set(HAVE_TCSETATTR 0)
set(HAVE_PERROR 1)
set(HAVE_CLOSESOCKET 1)
set(HAVE_SETVBUF 0)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b92c2b61..62b2235cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1005,8 +1005,6 @@ check_symbol_exists(gettimeofday "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY)
check_symbol_exists(inet_addr "${CURL_INCLUDES}" HAVE_INET_ADDR)
check_symbol_exists(inet_ntoa "${CURL_INCLUDES}" HAVE_INET_NTOA)
check_symbol_exists(inet_ntoa_r "${CURL_INCLUDES}" HAVE_INET_NTOA_R)
-check_symbol_exists(tcsetattr "${CURL_INCLUDES}" HAVE_TCSETATTR)
-check_symbol_exists(tcgetattr "${CURL_INCLUDES}" HAVE_TCGETATTR)
check_symbol_exists(perror "${CURL_INCLUDES}" HAVE_PERROR)
check_symbol_exists(closesocket "${CURL_INCLUDES}" HAVE_CLOSESOCKET)
check_symbol_exists(setvbuf "${CURL_INCLUDES}" HAVE_SETVBUF)
diff --git a/configure.ac b/configure.ac
index 653447476..73b7dc1ae 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4493,7 +4493,6 @@ CURL_CHECK_FUNC_STRCMPI
CURL_CHECK_FUNC_STRDUP
CURL_CHECK_FUNC_STRERROR_R
CURL_CHECK_FUNC_STRICMP
-CURL_CHECK_FUNC_STRNCASECMP
CURL_CHECK_FUNC_STRNCMPI
CURL_CHECK_FUNC_STRNICMP
CURL_CHECK_FUNC_STRSTR
diff --git a/lib/config-os400.h b/lib/config-os400.h
index b8676113d..67fbc41d8 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, 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
@@ -352,12 +352,6 @@
/* Define if you have the <sys/ioctl.h> header file. */
#define HAVE_SYS_IOCTL_H
-/* Define if you have the `tcgetattr' function. */
-#undef HAVE_TCGETATTR
-
-/* Define if you have the `tcsetattr' function. */
-#undef HAVE_TCSETATTR
-
/* Define if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index cc8adde72..f33d3f66b 100644
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, 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
@@ -173,7 +173,6 @@
#define HAVE_STRCASECMP 1
#define HAVE_STRDUP 1
#define HAVE_STRING_H 1
-#define HAVE_STRNCASECMP 1
#define HAVE_STRSTR 1
#define HAVE_STRTOK_R 1
#define HAVE_STRTOLL 1
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 9b5f8da92..43b1deb6d 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, 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
@@ -329,12 +329,6 @@
/* Define if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H
-/* Define if you have the `tcgetattr' function. */
-#define HAVE_TCGETATTR
-
-/* Define if you have the `tcsetattr' function. */
-#define HAVE_TCSETATTR
-
/* Define if you have the <termios.h> header file. */
#define HAVE_TERMIOS_H
diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index 73edd530b..8ae8ab10b 100644
--- a/lib/config-vxworks.h
+++ b/lib/config-vxworks.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, 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
@@ -568,9 +568,6 @@
/* Define to 1 if you have the `strlcpy' function. */
/* #undef HAVE_STRLCPY */
-/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
/* Define to 1 if you have the strncmpi function. */
/* #undef HAVE_STRNCMPI */
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 3f8b78a2b..a464fbf5a 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -258,9 +258,6 @@
/* Define if you have the stricmp function. */
#define HAVE_STRICMP 1
-/* Define if you have the strncasecmp function. */
-/* #define HAVE_STRNCASECMP 1 */
-
/* Define if you have the strnicmp function. */
#define HAVE_STRNICMP 1
@@ -273,12 +270,6 @@
#define HAVE_STRTOLL 1
#endif
-/* Define if you have the tcgetattr function. */
-/* #define HAVE_TCGETATTR 1 */
-
-/* Define if you have the tcsetattr function. */
-/* #define HAVE_TCSETATTR 1 */
-
/* Define if you have the utime function. */
#ifndef __BORLANDC__
#define HAVE_UTIME 1
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 906083694..7f59fd562 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, 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
@@ -205,9 +205,6 @@
/* Define if you have the stricmp function. */
/* #define HAVE_STRICMP 1 */
-/* Define if you have the strncasecmp function. */
-/* #define HAVE_STRNCASECMP 1 */
-
/* Define if you have the strnicmp function. */
/* #define HAVE_STRNICMP 1 */
@@ -219,12 +216,6 @@
#define HAVE_STRTOLL 1
#endif
-/* Define if you have the tcgetattr function. */
-/* #define HAVE_TCGETATTR 1 */
-
-/* Define if you have the tcsetattr function. */
-/* #define HAVE_TCSETATTR 1 */
-
/* Define if you have the utime function */
#define HAVE_UTIME 1
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 4c61a02c6..744406711 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -659,9 +659,6 @@
/* Define to 1 if you have the `strlcpy' function. */
#cmakedefine HAVE_STRLCPY 1
-/* Define to 1 if you have the strncasecmp function. */
-#cmakedefine HAVE_STRNCASECMP 1
-
/* Define to 1 if you have the strncmpi function. */
#cmakedefine HAVE_STRNCMPI 1
diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index 58a3cf443..fc4d6b2d0 100644
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, 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
@@ -6687,90 +6687,6 @@ AC_DEFUN([CURL_CHECK_FUNC_STRICMP], [
fi
])
-dnl CURL_CHECK_FUNC_STRNCASECMP
-dnl -------------------------------------------------
-dnl Verify if strncasecmp is available, prototyped, and
-dnl can be compiled. If all of these are true, and
-dnl usage has not been previously disallowed with
-dnl shell variable curl_disallow_strncasecmp, then
-dnl HAVE_STRNCASECMP will be defined.
-
-AC_DEFUN([CURL_CHECK_FUNC_STRNCASECMP], [
- AC_REQUIRE([CURL_INCLUDES_STRING])dnl
- #
- tst_links_strncasecmp="unknown"
- tst_proto_strncasecmp="unknown"
- tst_compi_strncasecmp="unknown"
- tst_allow_strncasecmp="unknown"
- #
- AC_MSG_CHECKING([if strncasecmp can be linked])
- AC_LINK_IFELSE([
- AC_LANG_FUNC_LINK_TRY([strncasecmp])
- ],[
- AC_MSG_RESULT([yes])
- tst_links_strncasecmp="yes"
- ],[
- AC_MSG_RESULT([no])
- tst_links_strncasecmp="no"
- ])
- #
- if test "$tst_links_strncasecmp" = "yes"; then
- AC_MSG_CHECKING([if strncasecmp is prototyped])
- AC_EGREP_CPP([strncasecmp],[
- $curl_includes_string
- ],[
- AC_MSG_RESULT([yes])
- tst_proto_strncasecmp="yes"
- ],[
- AC_MSG_RESULT([no])
- tst_proto_strncasecmp="no"
- ])
- fi
- #
- if test "$tst_proto_strncasecmp" = "yes"; then
- AC_MSG_CHECKING([if strncasecmp is compilable])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
- $curl_includes_string
- ]],[[
- if(0 != strncasecmp(0, 0, 0))
- return 1;
- ]])
- ],[
- AC_MSG_RESULT([yes])
- tst_compi_strncasecmp="yes"
- ],[
- AC_MSG_RESULT([no])
- tst_compi_strncasecmp="no"
- ])
- fi
- #
- if test "$tst_compi_strncasecmp" = "yes"; then
- AC_MSG_CHECKING([if strncasecmp usage allowed])
- if test "x$curl_disallow_strncasecmp" != "xyes"; then
- AC_MSG_RESULT([yes])
- tst_allow_strncasecmp="yes"
- else
- AC_MSG_RESULT([no])
- tst_allow_strncasecmp="no"
- fi
- fi
- #
- AC_MSG_CHECKING([if strncasecmp might be used])
- if test "$tst_links_strncasecmp" = "yes" &&
- test "$tst_proto_strncasecmp" = "yes" &&
- test "$tst_compi_strncasecmp" = "yes" &&
- test "$tst_allow_strncasecmp" = "yes"; then
- AC_MSG_RESULT([yes])
- AC_DEFINE_UNQUOTED(HAVE_STRNCASECMP, 1,
- [Define to 1 if you have the strncasecmp function.])
- curl_cv_func_strncasecmp="yes"
- else
- AC_MSG_RESULT([no])
- curl_cv_func_strncasecmp="no"
- fi
-])
-
dnl CURL_CHECK_FUNC_STRNCMPI
dnl -------------------------------------------------
View Lorry Controller Status