From 50f05a9503f10bbc6df4eb3ea02c7cf5e36fd6c9 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 3 May 2012 14:16:50 -0700 Subject: [PATCH] Update cinttype for older CentOS/RHEL versions. --- libmemcached-1.0/memcached.h | 19 +++++++++---------- m4/bottom.m4 | 8 ++++---- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h index da8ac7e3..fa966152 100644 --- a/libmemcached-1.0/memcached.h +++ b/libmemcached-1.0/memcached.h @@ -37,23 +37,22 @@ #pragma once -#include +/* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t */ +#define __STDC_FORMAT_MACROS #ifdef __cplusplus -#include -#include +# include +# include +# include #else -#include -#include +# include +# include +# include +# include #endif #include - -#if !defined(__cplusplus) -# include -#endif - #include #include #include diff --git a/m4/bottom.m4 b/m4/bottom.m4 index 9f99d428..303aaf7a 100644 --- a/m4/bottom.m4 +++ b/m4/bottom.m4 @@ -12,12 +12,12 @@ AH_TOP([ AH_BOTTOM([ +#define __STDC_FORMAT_MACROS + #if defined(__cplusplus) -#include CSTDINT_H -#include CINTTYPES_H +# include CINTTYPES_H #else -#include -#include +# include #endif #if !defined(HAVE_ULONG) && !defined(__USE_MISC) -- 2.30.2