← Back to branch summary

~brianaker/libmemcached/1164440

« back to all changes in this revision

Viewing changes to clients/ms_conn.c

  • Committer: Continuous Integration
  • Date: 2012-10-25 17:26:38 UTC
  • mfrom: (1086.1.11 libmemcached-1.0)
  • Revision ID: ci@tangent.org-20121025172638-fn8zbjv6trv39s4y
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-89

Show diffs side-by-side

added added

removed removed

Lines of Context:
clients/ms_conn.c
20
20
#include <netinet/tcp.h>
21
21
#include <netinet/in.h>
22
22
#include <arpa/inet.h>
23
 
#if TIME_WITH_SYS_TIME
 
23
 
 
24
#if defined(HAVE_SYS_TIME_H)
24
25
# include <sys/time.h>
 
26
#endif
 
27
 
 
28
#if defined(HAVE_TIME_H)
25
29
# include <time.h>
26
 
#else
27
 
# if HAVE_SYS_TIME_H
28
 
#  include <sys/time.h>
29
 
# else
30
 
#  include <time.h>
31
 
# endif
32
30
#endif
 
31
 
33
32
#include "ms_setting.h"
34
33
#include "ms_thread.h"
35
34
#include "ms_atomic.h"