[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 388/411: cmake: check for linux/tcp.h
From: |
gnunet |
Subject: |
[gnurl] 388/411: cmake: check for linux/tcp.h |
Date: |
Wed, 13 Jan 2021 01:23:23 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit d6bfbfadd30984737f4481087678219be88fc5f7
Author: Klaus Crusius <klaus.crusius@web.de>
AuthorDate: Sat Nov 28 18:17:11 2020 +0100
cmake: check for linux/tcp.h
The HAVE_LINUX_TCP_H define was not set by cmake.
Closes #6252
---
CMakeLists.txt | 1 +
lib/curl_config.h.cmake | 3 +++
lib/sendf.c | 2 ++
lib/setopt.c | 2 ++
4 files changed, 8 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a2ad440b..6a1a6fe8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -909,6 +909,7 @@ check_include_file_concat("net/if.h" HAVE_NET_IF_H)
check_include_file_concat("netdb.h" HAVE_NETDB_H)
check_include_file_concat("netinet/in.h" HAVE_NETINET_IN_H)
check_include_file_concat("netinet/tcp.h" HAVE_NETINET_TCP_H)
+check_include_file("linux/tcp.h" HAVE_LINUX_TCP_H)
check_include_file_concat("pem.h" HAVE_PEM_H)
check_include_file_concat("poll.h" HAVE_POLL_H)
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 9bf07433c..082d76b37 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -473,6 +473,9 @@
/* Define to 1 if you have the <netinet/tcp.h> header file. */
#cmakedefine HAVE_NETINET_TCP_H 1
+/* Define to 1 if you have the <linux/tcp.h> header file. */
+#cmakedefine HAVE_LINUX_TCP_H 1
+
/* Define to 1 if you have the <net/if.h> header file. */
#cmakedefine HAVE_NET_IF_H 1
diff --git a/lib/sendf.c b/lib/sendf.c
index b6e5e7463..04cc725f5 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -28,6 +28,8 @@
#ifdef HAVE_LINUX_TCP_H
#include <linux/tcp.h>
+#elif defined(HAVE_NETINET_TCP_H)
+#include <netinet/tcp.h>
#endif
#include <curl/curl.h>
diff --git a/lib/setopt.c b/lib/setopt.c
index 12a268e94..58956c1e9 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -30,6 +30,8 @@
#ifdef HAVE_LINUX_TCP_H
#include <linux/tcp.h>
+#elif defined(HAVE_NETINET_TCP_H)
+#include <netinet/tcp.h>
#endif
#include "urldata.h"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 304/411: rtsp: fixed Session ID comparison to refuse prefix, (continued)
- [gnurl] 304/411: rtsp: fixed Session ID comparison to refuse prefix, gnunet, 2021/01/12
- [gnurl] 350/411: KNOWN_BUGS: cmake build doesn't fail if zlib not found, gnunet, 2021/01/12
- [gnurl] 323/411: FAQ: remove "Why is there a HTTP/1.1 in my HTTP/2 request?", gnunet, 2021/01/12
- [gnurl] 365/411: winbuild: remove docs from Makefiles and refer to README.md, gnunet, 2021/01/12
- [gnurl] 343/411: tests/*server.py: close log file after each log line, gnunet, 2021/01/12
- [gnurl] 307/411: travis: use ninja-build for CMake builds, gnunet, 2021/01/12
- [gnurl] 287/411: tests: fix some http/2 tests for older versions of nghttpx, gnunet, 2021/01/12
- [gnurl] 408/411: gnurl adjustments (paths), gnunet, 2021/01/12
- [gnurl] 405/411: urldata: restore comment on ssl_connect_data.use, gnunet, 2021/01/12
- [gnurl] 396/411: scripts/completion.pl: parse all opts, gnunet, 2021/01/12
- [gnurl] 388/411: cmake: check for linux/tcp.h,
gnunet <=
- [gnurl] 401/411: ftp: make wc_statemach loop instead of recurse, gnunet, 2021/01/12
- [gnurl] 395/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 390/411: quiche: close the connection, gnunet, 2021/01/12
- [gnurl] 404/411: VERSIONS: refreshed, gnunet, 2021/01/12
- [gnurl] 402/411: openssl: make the OCSP verification verify the certificate id, gnunet, 2021/01/12
- [gnurl] 400/411: ftp: CURLOPT_FTP_SKIP_PASV_IP by default, gnunet, 2021/01/12
- [gnurl] 407/411: Merge tag 'curl-7_74_0', gnunet, 2021/01/12
- [gnurl] 381/411: tests/server/tftpd.c: close upload file in case of abort, gnunet, 2021/01/12
- [gnurl] 389/411: ngtcp2: Fix build error due to symbol name change, gnunet, 2021/01/12
- [gnurl] 281/411: curl.1: add an "OUTPUT" section at the top of the manpage, gnunet, 2021/01/12