From: Gisle Vanem Date: Mon, 22 Oct 2018 08:33:44 +0000 (+0200) Subject: rtmp: fix for compiling with lwIP X-Git-Tag: curl-7_62_0~33 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=639d052e4499c663a578d940713e40cd466268fa;p=curl rtmp: fix for compiling with lwIP Compiling on _WIN32 and with USE_LWIPSOCK, causes this error: curl_rtmp.c(223,3): error: use of undeclared identifier 'setsockopt' setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_RCVTIMEO, ^ curl_rtmp.c(41,32): note: expanded from macro 'setsockopt' #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e) ^ Closes #3155 --- diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index 97430647b..f09f2f332 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -37,9 +37,11 @@ /* The last #include file should be: */ #include "memdebug.h" -#ifdef _WIN32 +#if defined(WIN32) && !defined(USE_LWIPSOCK) #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e) #define SET_RCVTIMEO(tv,s) int tv = s*1000 +#elif defined(LWIP_SO_SNDRCVTIMEO_NONSTANDARD) +#define SET_RCVTIMEO(tv,s) int tv = s*1000 #else #define SET_RCVTIMEO(tv,s) struct timeval tv = {s,0} #endif