projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update from build trunk.
[m6w6/libmemcached]
/
libmemcached
/
connect.cc
diff --git
a/libmemcached/connect.cc
b/libmemcached/connect.cc
index 2ec9975c319d5ba23f260c15b3ca4a5121441ea8..22e259f41f3335fdfb75dcd23a040bfef4d00cb5 100644
(file)
--- a/
libmemcached/connect.cc
+++ b/
libmemcached/connect.cc
@@
-267,7
+267,7
@@
static memcached_return_t set_hostinfo(org::libmemcached::Instance* server)
static inline void set_socket_nonblocking(org::libmemcached::Instance* server)
{
static inline void set_socket_nonblocking(org::libmemcached::Instance* server)
{
-#if
def WIN32
+#if
defined(_WIN32)
u_long arg= 1;
if (ioctlsocket(server->fd, FIONBIO, &arg) == SOCKET_ERROR)
{
u_long arg= 1;
if (ioctlsocket(server->fd, FIONBIO, &arg) == SOCKET_ERROR)
{
@@
-372,7
+372,7
@@
static bool set_socket_options(org::libmemcached::Instance* server)
#if defined(_WIN32)
#else
#if defined(_WIN32)
#else
-#if defined(SO_NOSIGPIPE)
+#
if defined(SO_NOSIGPIPE)
if (SO_NOSIGPIPE)
{
int set= 1;
if (SO_NOSIGPIPE)
{
int set= 1;
@@
-388,7
+388,7
@@
static bool set_socket_options(org::libmemcached::Instance* server)
#endif
}
}
#endif
}
}
-#endif // SO_NOSIGPIPE
+#
endif // SO_NOSIGPIPE
#endif // _WIN32
if (server->root->flags.no_block)
#endif // _WIN32
if (server->root->flags.no_block)
@@
-461,7
+461,7
@@
static bool set_socket_options(org::libmemcached::Instance* server)
static memcached_return_t unix_socket_connect(org::libmemcached::Instance* server)
{
static memcached_return_t unix_socket_connect(org::libmemcached::Instance* server)
{
-#ifndef WIN32
+#ifndef
_
WIN32
WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
do {
WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
do {