From a46d1146ad27478805dfed8fd89c3d04b77f9b96 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 8 Oct 2010 15:12:29 +0000 Subject: [PATCH] * nm.c (value_format_64bit): Define appropriately for __MSVCRT__. (set_print_radix): Update for __MSVCRT__ definition of value_format_64bit. --- binutils/ChangeLog | 6 ++++++ binutils/nm.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 1ad5a7a1a62..1d9d87592f0 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2010-10-08 Joseph Myers + + * nm.c (value_format_64bit): Define appropriately for __MSVCRT__. + (set_print_radix): Update for __MSVCRT__ definition of + value_format_64bit. + 2010-10-08 Pierre Muller Fix build with -DDEBUG=7 diff --git a/binutils/nm.c b/binutils/nm.c index 862b2b95ae7..3b75edf3cd8 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -164,7 +164,11 @@ static char value_format_32bit[] = "%08lx"; #if BFD_HOST_64BIT_LONG static char value_format_64bit[] = "%016lx"; #elif BFD_HOST_64BIT_LONG_LONG +#ifndef __MSVCRT__ static char value_format_64bit[] = "%016llx"; +#else +static char value_format_64bit[] = "%016I64x"; +#endif #endif static int print_width = 0; static int print_radix = 16; @@ -285,7 +289,11 @@ set_print_radix (char *radix) #if BFD_HOST_64BIT_LONG value_format_64bit[5] = *radix; #elif BFD_HOST_64BIT_LONG_LONG +#ifndef __MSVCRT__ value_format_64bit[6] = *radix; +#else + value_format_64bit[7] = *radix; +#endif #endif other_format[3] = desc_format[3] = *radix; break; -- 2.30.2