projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
m4: ax_assert
[m6w6/libmemcached]
/
libmemcached-1.0
/
memcached.h
diff --git
a/libmemcached-1.0/memcached.h
b/libmemcached-1.0/memcached.h
index fba30674192dbc3c251c2892117817a046968055..bc16e7370953e112f68e808d27b3e0b2c152dacb 100644
(file)
--- a/
libmemcached-1.0/memcached.h
+++ b/
libmemcached-1.0/memcached.h
@@
-37,15
+37,24
@@
#pragma once
#pragma once
-#include <inttypes.h>
-#i
nclude <stdlib.h>
-#
include <sys/types.h>
-
+/* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t */
+#i
fndef __STDC_FORMAT_MACROS
+#
define __STDC_FORMAT_MACROS
+#endif
-#if !defined(__cplusplus)
-# include <stdbool.h>
+#ifdef __cplusplus
+# include <cinttypes>
+# include <cstddef>
+# include <cstdlib>
+#else
+# include <inttypes.h>
+# include <stddef.h>
+# include <stdlib.h>
+# include <stdbool.h>
#endif
#endif
+#include <sys/types.h>
+
#include <libmemcached-1.0/visibility.h>
#include <libmemcached-1.0/configure.h>
#include <libmemcached-1.0/platform.h>
#include <libmemcached-1.0/visibility.h>
#include <libmemcached-1.0/configure.h>
#include <libmemcached-1.0/platform.h>
@@
-90,6
+99,7
@@
#include <libmemcached-1.0/callback.h>
#include <libmemcached-1.0/delete.h>
#include <libmemcached-1.0/dump.h>
#include <libmemcached-1.0/callback.h>
#include <libmemcached-1.0/delete.h>
#include <libmemcached-1.0/dump.h>
+#include <libmemcached-1.0/encoding_key.h>
#include <libmemcached-1.0/exist.h>
#include <libmemcached-1.0/fetch.h>
#include <libmemcached-1.0/flush.h>
#include <libmemcached-1.0/exist.h>
#include <libmemcached-1.0/fetch.h>
#include <libmemcached-1.0/flush.h>
@@
-146,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 *);