diff options
| -rw-r--r-- | CMake/Platforms/WindowsCache.cmake | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
| -rw-r--r-- | tests/server/tftpd.c | 6 |
5 files changed, 1 insertions, 11 deletions
diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake index 44a1fc969..6a8756623 100644 --- a/CMake/Platforms/WindowsCache.cmake +++ b/CMake/Platforms/WindowsCache.cmake @@ -53,7 +53,6 @@ if(NOT UNIX) set(HAVE_LIBZ 0) set(HAVE_ARPA_INET_H 0) - set(HAVE_ARPA_TFTP_H 0) set(HAVE_FCNTL_H 1) set(HAVE_IFADDRS_H 0) set(HAVE_IO_H 1) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a2e08d7f..45838483c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1035,7 +1035,6 @@ check_include_file_concat("sys/un.h" HAVE_SYS_UN_H) check_include_file_concat("sys/utime.h" HAVE_SYS_UTIME_H) check_include_file_concat("sys/xattr.h" HAVE_SYS_XATTR_H) check_include_file_concat("arpa/inet.h" HAVE_ARPA_INET_H) -check_include_file_concat("arpa/tftp.h" HAVE_ARPA_TFTP_H) check_include_file_concat("fcntl.h" HAVE_FCNTL_H) check_include_file_concat("idn2.h" HAVE_IDN2_H) check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) diff --git a/configure.ac b/configure.ac index 15fbda12a..a2c8e2ee3 100644 --- a/configure.ac +++ b/configure.ac @@ -3443,7 +3443,6 @@ AC_CHECK_HEADERS( libgen.h \ locale.h \ stdbool.h \ - arpa/tftp.h \ sys/filio.h \ sys/wait.h \ setjmp.h, diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 65901a2b1..328a77d73 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -162,9 +162,6 @@ /* Define to 1 if you have the <arpa/inet.h> header file. */ #cmakedefine HAVE_ARPA_INET_H 1 -/* Define to 1 if you have the <arpa/tftp.h> header file. */ -#cmakedefine HAVE_ARPA_TFTP_H 1 - /* Define to 1 if you have _Atomic support. */ #cmakedefine HAVE_ATOMIC 1 diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 8bcd452d0..8db82ff23 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -67,11 +67,6 @@ #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif -#ifdef HAVE_ARPA_TFTP_H -#include <arpa/tftp.h> -#else -#include "tftp.h" -#endif #ifdef HAVE_NETDB_H #include <netdb.h> #endif @@ -97,6 +92,7 @@ #include "getpart.h" #include "util.h" #include "server_sockaddr.h" +#include "tftp.h" /* include memdebug.h last */ #include "memdebug.h" |