projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge from trunk.
[m6w6/libmemcached]
/
libmemcached
/
options
/
symbol.h
diff --git
a/libmemcached/options/symbol.h
b/libmemcached/options/symbol.h
index b14eb331116996eed4a82a6add1e3285bf3d4c3a..17e5f62a6428350ca4edb19fb3ab2d7eab13d9b7 100644
(file)
--- a/
libmemcached/options/symbol.h
+++ b/
libmemcached/options/symbol.h
@@
-37,21
+37,21
@@
#pragma once
#pragma once
+#include <libmemcached/basic_string.h>
#include <libmemcached/constants.h>
#include <libmemcached/constants.h>
-#include <libmemcached/options/string.h>
#include <libmemcached/options/server.h>
union YYSTYPE
{
long long number;
#include <libmemcached/options/server.h>
union YYSTYPE
{
long long number;
- string_t string;
- string_t option;
- server_t server;
+ memcached_string_t string;
+ memcached_string_t option;
double double_number;
memcached_server_distribution_t distribution;
memcached_hash_t hash;
memcached_behavior_t behavior;
bool boolean;
double double_number;
memcached_server_distribution_t distribution;
memcached_hash_t hash;
memcached_behavior_t behavior;
bool boolean;
+ server_t server;
};
typedef union YYSTYPE YYSTYPE;
};
typedef union YYSTYPE YYSTYPE;