projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove index, causes issues of recursion.
[awesomized/libmemcached]
/
libmemcached
/
string.h
diff --git
a/libmemcached/string.h
b/libmemcached/string.h
index 5dd7d8dd7b0cdde0ef595f9ac13603d82713d6d9..ca3dad14faa64e2601c652b1f98b624a26df69b6 100644
(file)
--- a/
libmemcached/string.h
+++ b/
libmemcached/string.h
@@
-27,7
+27,7
@@
struct memcached_string_st {
char *end;
char *string;
size_t current_size;
char *end;
char *string;
size_t current_size;
-
const
memcached_st *root;
+ memcached_st *root;
struct {
bool is_allocated:1;
bool is_initialized:1;
struct {
bool is_allocated:1;
bool is_initialized:1;
@@
-80,18
+80,22
@@
char *memcached_string_value_mutable(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
void memcached_string_set_length(memcached_string_st *self, size_t length);
LIBMEMCACHED_LOCAL
void memcached_string_set_length(memcached_string_st *self, size_t length);
-LIBMEMCACHED_LOCAL
-memcached_string_t memcached_string_make(const char *str, size_t length);
-
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
+#ifdef BUILDING_LIBMEMCACHED
#ifdef __cplusplus
#define memcached_string_with_size(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
#ifdef __cplusplus
#define memcached_string_with_size(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
+#define memcached_string_make(X) (static_cast<size_t>((sizeof(X) - 1))), (X)
#else
#define memcached_string_with_size(X) (X), ((size_t)((sizeof(X) - 1)))
#else
#define memcached_string_with_size(X) (X), ((size_t)((sizeof(X) - 1)))
+#define memcached_string_make(X) (((size_t)((sizeof(X) - 1))), (X)
+#endif
+
+#define memcached_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+
#endif
#endif /* __LIBMEMCACHED_STRING_H__ */
#endif
#endif /* __LIBMEMCACHED_STRING_H__ */