X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fms_conn.c;h=b488401c126d6298919ad22cbb72f71bdb3c5327;hb=a6d18834a85d2a65caae820ee426169af5aff800;hp=c062dc2958df424eb1e165e0e6cf6ce33396033f;hpb=8c0dca3fe0a9cfbf6f2d595dedaabc08c9ef8dda;p=m6w6%2Flibmemcached diff --git a/clients/ms_conn.c b/clients/ms_conn.c index c062dc29..b488401c 100644 --- a/clients/ms_conn.c +++ b/clients/ms_conn.c @@ -19,6 +19,16 @@ #include #include #include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #include "ms_setting.h" #include "ms_thread.h" #include "ms_atomic.h" @@ -909,12 +919,12 @@ static int ms_reconn(ms_conn_t *c) if (ms_setting.rep_write_srv > 0) { srv_idx= c->cur_idx; - srv_conn_cnt= ms_setting.nconns; + srv_conn_cnt= (int)ms_setting.nconns; } else { srv_idx= ms_thread->thread_ctx->srv_idx; - srv_conn_cnt= ms_setting.nconns / ms_setting.srv_cnt; + srv_conn_cnt= (int32_t)((int)ms_setting.nconns / ms_setting.srv_cnt); } /* close the old socket handler */ @@ -1037,12 +1047,12 @@ int ms_reconn_socks(ms_conn_t *c) if (ms_setting.rep_write_srv > 0) { srv_idx= i; - srv_conn_cnt= ms_setting.nconns; + srv_conn_cnt= (int)ms_setting.nconns; } else { srv_idx= ms_thread->thread_ctx->srv_idx; - srv_conn_cnt= ms_setting.nconns / ms_setting.srv_cnt; + srv_conn_cnt= (int)ms_setting.nconns / ms_setting.srv_cnt; } if (ms_network_connect(c, ms_setting.servers[srv_idx].srv_host_name,