summaryrefslogtreecommitdiff
path: root/binutils/nm.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2010-10-08 15:12:28 +0000
committerJoseph Myers <joseph@codesourcery.com>2010-10-08 15:12:28 +0000
commit8e9b1e8ba7901fe085723cfa7d7ef2c5ea132adb (patch)
tree69f95d9b5ed7eefcf26ba42d6a567eb927a7e8df /binutils/nm.c
parent0872d67b6382af85382c126839e530402582ba2d (diff)
downloadbinutils-redhat-8e9b1e8ba7901fe085723cfa7d7ef2c5ea132adb.tar.gz
* nm.c (value_format_64bit): Define appropriately for __MSVCRT__.
(set_print_radix): Update for __MSVCRT__ definition of value_format_64bit.
Diffstat (limited to 'binutils/nm.c')
-rw-r--r--binutils/nm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/binutils/nm.c b/binutils/nm.c
index 862b2b95ae..3b75edf3cd 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;