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

diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h
index fa966152..bc16e737 100644
--- a/libmemcached-1.0/memcached.h
+++ b/libmemcached-1.0/memcached.h
@@ -38,10 +38,12 @@
 #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>
+#  include <cinttypes>
 #  include <cstddef>
 #  include <cstdlib>
 #else
@@ -154,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 *);