Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170

[awesomized/libmemcached] / libmemcached-1.0 / memcached.h

diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h
index da8ac7e35de85f7aa683a9ac0a4df10e722d639e..23462a760bf97f672571d20fb873d0a0be60af0e 100644 (file)
--- a/libmemcached-1.0/memcached.h
+++ b/libmemcached-1.0/memcached.h
@@ -37,23 +37,24 @@
 
 #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
-#include <cstddef>
-#include <cstdlib>
+#  include <tr1/cinttypes>
+#  include <cstddef>
+#  include <cstdlib>
 #else
-#include <stddef.h>
-#include <stdlib.h>
+#  include <inttypes.h>
+#  include <stddef.h>
+#  include <stdlib.h>
+#  include <stdbool.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>