X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached-1.0%2Fmemcached.h;h=1ee54bbe03613e8b07945fc5000c02f2df480ecc;hb=c3ae351518d98e7a9b217a356b826c0917ad0374;hp=fa9661528002e9f3712ace1f0679065d678c9213;hpb=f363012dbad70fe0d1e6d714f432e1567cef4935;p=awesomized%2Flibmemcached

diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h
index fa966152..1ee54bbe 100644
--- a/libmemcached-1.0/memcached.h
+++ b/libmemcached-1.0/memcached.h
@@ -38,10 +38,16 @@
 #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>
+#  if __cplusplus >= 201103L
+#    include <cinttypes>
+#  else
+#    include <inttypes.h>
+#  endif
 #  include <cstddef>
 #  include <cstdlib>
 #else
@@ -154,7 +160,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 *);