projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merged trunk.
[m6w6/libmemcached]
/
clients
/
ms_setting.c
diff --git
a/clients/ms_setting.c
b/clients/ms_setting.c
index 8bcb4db5962655005d78ea999f5f3bcc41b4e2bf..51f89714ac7c407f1039698444c6e2bbf3d23e70 100644
(file)
--- a/
clients/ms_setting.c
+++ b/
clients/ms_setting.c
@@
-8,6
+8,9
@@
* http://www.schoonerinfotech.com/
*
*/
* http://www.schoonerinfotech.com/
*
*/
+
+#include "config.h"
+
#include <ctype.h>
#include "ms_setting.h"
#include "ms_conn.h"
#include <ctype.h>
#include "ms_setting.h"
#include "ms_conn.h"
@@
-32,7
+35,7
@@
const char ALPHANUMBERICS[]=
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-";
const char ALPHANUMBERICS[]=
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-";
-ms_setting_t ms_setting; /* store the settings specified by user */
+ms_setting_
s
t ms_setting; /* store the settings specified by user */
/* read setting from configuration file */
/* read setting from configuration file */
@@
-818,7
+821,7
@@
static void ms_setting_slapmode_init_pre()
*/
void ms_setting_init_pre()
{
*/
void ms_setting_init_pre()
{
- memset(&ms_setting, 0, sizeof(ms_setting
_t
));
+ memset(&ms_setting, 0, sizeof(ms_setting));
/* common initialize */
ms_setting.ncpu= ms_get_cpu_count();
/* common initialize */
ms_setting.ncpu= ms_get_cpu_count();