projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for case where key may not be checked.
[m6w6/libmemcached]
/
libmemcached-1.0
/
memcached.h
diff --git
a/libmemcached-1.0/memcached.h
b/libmemcached-1.0/memcached.h
index fa9661528002e9f3712ace1f0679065d678c9213..3c11f6193e2f10997aa1cc868f61e64952b2e12a 100644
(file)
--- a/
libmemcached-1.0/memcached.h
+++ b/
libmemcached-1.0/memcached.h
@@
-38,7
+38,9
@@
#pragma once
/* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t */
#pragma once
/* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t */
-#define __STDC_FORMAT_MACROS
+#ifndef __STDC_FORMAT_MACROS
+# define __STDC_FORMAT_MACROS
+#endif
#ifdef __cplusplus
# include <tr1/cinttypes>
#ifdef __cplusplus
# include <tr1/cinttypes>
@@
-154,7
+156,7
@@
LIBMEMCACHED_API
memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source);
LIBMEMCACHED_API
memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source);
LIBMEMCACHED_API
-
memcached_server_instance_st
memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key);
+
const memcached_instance_st *
memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key);
LIBMEMCACHED_API
uint32_t memcached_server_count(const memcached_st *);
LIBMEMCACHED_API
uint32_t memcached_server_count(const memcached_st *);