projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
libhashkit: fix UB on unaligned access
[awesomized/libmemcached]
/
libmemcached-1.0
/
memcached.h
diff --git
a/libmemcached-1.0/memcached.h
b/libmemcached-1.0/memcached.h
index da8ac7e35de85f7aa683a9ac0a4df10e722d639e..bc16e7370953e112f68e808d27b3e0b2c152dacb 100644
(file)
--- a/
libmemcached-1.0/memcached.h
+++ b/
libmemcached-1.0/memcached.h
@@
-37,23
+37,24
@@
#pragma once
#pragma once
-#include <inttypes.h>
+/* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t */
+#ifndef __STDC_FORMAT_MACROS
+# define __STDC_FORMAT_MACROS
+#endif
#ifdef __cplusplus
#ifdef __cplusplus
-#include <cstddef>
-#include <cstdlib>
+# include <cinttypes>
+# include <cstddef>
+# include <cstdlib>
#else
#else
-#include <stddef.h>
-#include <stdlib.h>
+# include <inttypes.h>
+# include <stddef.h>
+# include <stdlib.h>
+# include <stdbool.h>
#endif
#include <sys/types.h>
#endif
#include <sys/types.h>
-
-#if !defined(__cplusplus)
-# include <stdbool.h>
-#endif
-
#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>
@@
-155,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 *);