From 09f4c7a33f5676a8251a21add4705224ec3b14f4 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Sun, 21 Jun 2015 17:19:06 -0700
Subject: [PATCH] workaround TCP_NODELAY defined in windows headers

---
 curl-helper.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/curl-helper.c b/curl-helper.c
index 5818d9e..7202d31 100644
--- a/curl-helper.c
+++ b/curl-helper.c
@@ -1441,13 +1441,13 @@ static void handle_##name(Connection *conn, value option) \
     CAMLreturn0; \
 }
 
-#define SETOPT_VAL(name, conv_val) \
-static void handle_##name(Connection *conn, value option) \
+#define SETOPT_VAL_(func_name, curl_option, conv_val) \
+static void func_name(Connection *conn, value option) \
 { \
     CAMLparam1(option); \
     CURLcode result = CURLE_OK; \
 \
-    result = curl_easy_setopt(conn->connection, CURLOPT_##name, conv_val(option)); \
+    result = curl_easy_setopt(conn->connection, curl_option, conv_val(option)); \
 \
     if (result != CURLE_OK) \
         raiseError(conn, result); \
@@ -1455,6 +1455,7 @@ static void handle_##name(Connection *conn, value option) \
     CAMLreturn0; \
 }
 
+#define SETOPT_VAL(name, conv) SETOPT_VAL_(handle_##name, CURLOPT_##name, conv)
 #define SETOPT_BOOL(name) SETOPT_VAL(name, Bool_val)
 #define SETOPT_LONG(name) SETOPT_VAL(name, Long_val)
 #define SETOPT_INT64(name) SETOPT_VAL(name, Int64_val)
@@ -2379,7 +2380,8 @@ SETOPT_INT64( POSTFIELDSIZE_LARGE)
 #endif
 
 #if HAVE_DECL_CURLOPT_TCP_NODELAY
-SETOPT_BOOL( TCP_NODELAY)
+/* not using SETOPT_BOOL here because of TCP_NODELAY defined in winsock.h */
+SETOPT_VAL_( handle_TCP_NODELAY, CURLOPT_TCP_NODELAY, Bool_val)
 #endif
 
 #if HAVE_DECL_CURLOPT_FTPSSLAUTH
-- 
2.11.4.GIT