X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached-1.0%2Fmemcached.h;h=bc16e7370953e112f68e808d27b3e0b2c152dacb;hb=9351ece659f57ee704b5f0ccfd4b531677ff36f8;hp=fba30674192dbc3c251c2892117817a046968055;hpb=9169cee9ec0f231b3117a0d5a7840d2067f29610;p=awesomized%2Flibmemcached

diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h
index fba30674..bc16e737 100644
--- a/libmemcached-1.0/memcached.h
+++ b/libmemcached-1.0/memcached.h
@@ -37,15 +37,24 @@
 
 #pragma once
 
-#include <inttypes.h>
-#include <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  */
+#ifndef __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
 
+#include <sys/types.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/encoding_key.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_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 *);