projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Cleanup for version 0.26
[awesomized/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index c5157629670fddd9daa7b29deb5a5200fd3ceaf6..ca35420066582efcf7d62cc18e24845ca4921fa8 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-51,7
+51,7
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
-#if
ndef __sun
+#if
def HAVE_SNDTIMEO
if (ptr->root->snd_timeout)
{
int error;
if (ptr->root->snd_timeout)
{
int error;
@@
-64,7
+64,9
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
+#endif
+#ifdef HAVE_RCVTIMEO
if (ptr->root->rcv_timeout)
{
int error;
if (ptr->root->rcv_timeout)
{
int error;