Browse Source

Merge pull request #19 from ycros/cgminer

OSX: fix setsockopt compile bug
nfactor-troky
Con Kolivas 14 years ago
parent
commit
8b859aa72f
  1. 16
      util.c

16
util.c

@ -26,6 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#ifndef WIN32 #ifndef WIN32
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h>
# include <netinet/tcp.h> # include <netinet/tcp.h>
#else #else
# include <winsock2.h> # include <winsock2.h>
@ -257,11 +258,13 @@ int json_rpc_call_sockopt_cb(void *userdata, curl_socket_t fd, curlsocktype purp
int tcp_keepidle = 120; int tcp_keepidle = 120;
int tcp_keepintvl = 120; int tcp_keepintvl = 120;
#ifndef WIN32 #ifndef WIN32
if (unlikely(setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive)))) if (unlikely(setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive))))
return 1; return 1;
# ifndef __APPLE_CC__
if (unlikely(setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &tcp_keepcnt, sizeof(tcp_keepcnt)))) if (unlikely(setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &tcp_keepcnt, sizeof(tcp_keepcnt))))
return 1; return 1;
@ -271,7 +274,14 @@ int json_rpc_call_sockopt_cb(void *userdata, curl_socket_t fd, curlsocktype purp
if (unlikely(setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &tcp_keepintvl, sizeof(tcp_keepintvl)))) if (unlikely(setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &tcp_keepintvl, sizeof(tcp_keepintvl))))
return 1; return 1;
#else # else
if (unlikely(setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &tcp_keepintvl, sizeof(tcp_keepintvl))))
return 1;
# endif
#else
struct tcp_keepalive vals; struct tcp_keepalive vals;
vals.onoff = 1; vals.onoff = 1;
@ -283,7 +293,7 @@ int json_rpc_call_sockopt_cb(void *userdata, curl_socket_t fd, curlsocktype purp
if (unlikely(WSAIoctl(fd, SIO_KEEPALIVE_VALS, &vals, sizeof(vals), NULL, 0, &outputBytes, NULL, NULL))) if (unlikely(WSAIoctl(fd, SIO_KEEPALIVE_VALS, &vals, sizeof(vals), NULL, 0, &outputBytes, NULL, NULL)))
return 1; return 1;
#endif #endif
return 0; return 0;
} }

Loading…
Cancel
Save