From: Bruno Haible Date: Tue, 21 Jul 2020 07:53:29 +0000 (+0200) Subject: inttypes: Fix PRI*PTR and SCN*PTR on 64-bit native Windows. X-Git-Tag: v1.0~3877 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b768bbdd15f2473d2d60b31702ef54d93a65d537;p=gnulib.git inttypes: Fix PRI*PTR and SCN*PTR on 64-bit native Windows. * m4/inttypes.m4 (gl_INTTYPES_PRI_SCN): On 64-bit native Windows, make sure PRIPTR_PREFIX is defined to "ll", not "l". --- diff --git a/ChangeLog b/ChangeLog index 7ebfe9ebdc..654ad7c1ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-07-21 Bruno Haible + + inttypes: Fix PRI*PTR and SCN*PTR on 64-bit native Windows. + * m4/inttypes.m4 (gl_INTTYPES_PRI_SCN): On 64-bit native Windows, make + sure PRIPTR_PREFIX is defined to "ll", not "l". + 2020-07-21 Bruno Haible printf-posix: Make an autoconf test more future-proof. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 224d0cdd8e..f9f5f86e0f 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,4 +1,4 @@ -# inttypes.m4 serial 29 +# inttypes.m4 serial 30 dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -39,8 +39,17 @@ AC_DEFUN([gl_INTTYPES_PRI_SCN], PRIPTR_PREFIX= if test -n "$STDINT_H"; then - dnl Using the gnulib . It always defines intptr_t to 'long'. - PRIPTR_PREFIX='"l"' + dnl Using the gnulib . It defines intptr_t to 'long' or + dnl 'long long', depending on _WIN64. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef _WIN64 + LLP64 + #endif + ]]), + ], + [PRIPTR_PREFIX='"l"'], + [PRIPTR_PREFIX='"ll"']) else dnl Using the system's . for glpfx in '' l ll I64; do