aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-01-09 19:29:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-09 19:29:42 +0000
commit7ba588d9be8bf9af8d3dfcf2eef65448c684383c (patch)
tree9547cbcf6ebd9868b2055c276b2fdd20d86b66cb
parentfb9bb4b2ab398c43e78c91e514b108e0ed83520d (diff)
parent47e32a363e2398e0f82ad70ee467fc48943c975d (diff)
downloadandroid_external_curl-7ba588d9be8bf9af8d3dfcf2eef65448c684383c.tar.gz
android_external_curl-7ba588d9be8bf9af8d3dfcf2eef65448c684383c.tar.bz2
android_external_curl-7ba588d9be8bf9af8d3dfcf2eef65448c684383c.zip
Merge "Fix Mac build (probably)." am: d5b0896d7a
am: 47e32a363e Change-Id: I2f0e62d133377a9c5da50f3ca7baf6d823d69e5a
-rw-r--r--lib/curl_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/curl_config.h b/lib/curl_config.h
index f5ba927..4d80994 100644
--- a/lib/curl_config.h
+++ b/lib/curl_config.h
@@ -433,7 +433,9 @@
#define HAVE_LIMITS_H 1
/* Define to 1 if you have the <linux/tcp.h> header file. */
+#if !defined(__APPLE__)
#define HAVE_LINUX_TCP_H 1
+#endif
/* if your compiler supports LL */
#define HAVE_LL 1