projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge.
[awesomized/libmemcached]
/
libmemcached
/
memcached.h
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index ebe5f2396974905b931a8896629c7c1647dd5c30..b60922929eead41609d52038005436bd831afbc0 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-12,6
+12,9
@@
#include <stdlib.h>
#include <inttypes.h>
#include <stdlib.h>
#include <inttypes.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <netinet/in.h>
@@
-70,7
+73,7
@@
struct memcached_stat_st {
struct memcached_st {
uint8_t purging;
struct memcached_st {
uint8_t purging;
-
memcached_allocated
is_allocated;
+
bool
is_allocated;
memcached_server_st *hosts;
uint32_t number_of_hosts;
uint32_t cursor_server;
memcached_server_st *hosts;
uint32_t number_of_hosts;
uint32_t cursor_server;
@@
-167,10
+170,10
@@
memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s
uint32_t weight,
memcached_return *error);
unsigned int memcached_server_list_count(memcached_server_st *ptr);
uint32_t weight,
memcached_return *error);
unsigned int memcached_server_list_count(memcached_server_st *ptr);
-memcached_server_st *memcached_servers_parse(char *server_strings);
+memcached_server_st *memcached_servers_parse(c
onst c
har *server_strings);
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
- char *key, memcached_return *error);
+ c
onst c
har *key, memcached_return *error);
char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
memcached_return *error);
char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
memcached_return *error);