* nm.c (value_format_64bit): Define appropriately for __MSVCRT__.

	(set_print_radix): Update for __MSVCRT__ definition of
	value_format_64bit.

2 files changed, 14 insertions, 0 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1ad5a7a..1d9d875 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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  <muller@ics.u-strasbg.fr>
 
 	Fix build with -DDEBUG=7
diff --git a/binutils/nm.c b/binutils/nm.c
index 862b2b9..3b75edf 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;