From 85907fe082d4611518a6f3031d7a23f007d471fa Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 6 Nov 2014 17:45:14 +0000 Subject: 2014-11-06 Joel Sherrill * configure.in: Add autoconf test to determine size of uintptr_t. * newlib.hin: Add new autoconf feature variables. * libc/include/inttypes.h: Use new feature variables. * configure: Regenerate. --- newlib/libc/include/inttypes.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'newlib/libc') diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index 2470b09d4..5a8770bc6 100644 --- a/newlib/libc/include/inttypes.h +++ b/newlib/libc/include/inttypes.h @@ -243,15 +243,15 @@ #define SCNxMAX __SCNMAX(x) /* ptr types */ -#if PTRDIFF_MAX <= __STDINT_EXP(INT_MAX) -# define __PRIPTR(x) __STRINGIFY(x) -# define __SCNPTR(x) __STRINGIFY(x) -#elif PTRDIFF_MAX <= __STDINT_EXP(LONG_MAX) || !defined(__have_longlong64) +#if defined(_UINTPTR_EQ_ULONGLONG) +# define __PRIPTR(x) __STRINGIFY(ll##x) +# define __SCNPTR(x) __STRINGIFY(ll##x) +#elif defined(_UINTPTR_EQ_ULONG) # define __PRIPTR(x) __STRINGIFY(l##x) # define __SCNPTR(x) __STRINGIFY(l##x) #else -# define __PRIPTR(x) __STRINGIFY(ll##x) -# define __SCNPTR(x) __STRINGIFY(ll##x) +# define __PRIPTR(x) __STRINGIFY(x) +# define __SCNPTR(x) __STRINGIFY(x) #endif #define PRIdPTR __PRIPTR(d) -- cgit v1.2.3