projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-89
[awesomized/libmemcached]
/
clients
/
ms_conn.c
diff --git
a/clients/ms_conn.c
b/clients/ms_conn.c
index 3a6fd8e7da3b4ce269cac9c8e9d4fde4e4d80310..2a65f6cfa423cf83951fba2c8e20db67789243ab 100644
(file)
--- a/
clients/ms_conn.c
+++ b/
clients/ms_conn.c
@@
-20,16
+20,15
@@
#include <netinet/tcp.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#if TIME_WITH_SYS_TIME
+
+#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
# include <sys/time.h>
+#endif
+
+#if defined(HAVE_TIME_H)
# include <time.h>
# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
#endif
+
#include "ms_setting.h"
#include "ms_thread.h"
#include "ms_atomic.h"
#include "ms_setting.h"
#include "ms_thread.h"
#include "ms_atomic.h"
@@
-358,7
+357,7
@@
static int ms_conn_init(ms_conn_t *c,
c->mlget_task.mlget_num= 0;
c->mlget_task.value_index= -1; /* default invalid value */
c->mlget_task.mlget_num= 0;
c->mlget_task.value_index= -1; /* default invalid value */
- if (ms_setting.binary_prot)
+ if (ms_setting.binary_prot
_
)
{
c->protocol= binary_prot;
}
{
c->protocol= binary_prot;
}