Don't #ifdef inside printf in case printf is a macro.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b79058bf9ec5e0cc727fdae14029f3740ac61896..32a830539a906cb18063bb87297e87a6ad37390a 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-10  Alan Modra  <alan@linuxcare.com.au>
+
+       * nm.c (print_symbol_info_bsd): Don't #ifdef inside printf in case
+       printf is a macro.
+
 2001-02-04  Philip Blundell  <philb@gnu.org>
 
        * configure.in (OBJDUMP_DEFS): Match `arm*-*', not just `arm-*'.

diff --git a/binutils/nm.c b/binutils/nm.c
index f1219eb7e6d3e59011159e7bde3d589b1046839e..3695d1e760f1c59f4ea5c13781c572f8218a7b05 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -1,5 +1,5 @@
 /* nm.c -- Describe symbol table of a rel file.
-   Copyright 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -1473,13 +1473,11 @@ print_symbol_info_bsd (info, abfd)
 {
   if (bfd_is_undefined_symclass (info->type))
     {
-      printf ("%*s",
 #ifdef BFD64
-             16,
+      printf ("%*s", 16, "");
 #else
-             8,
+      printf ("%*s", 8, "");
 #endif
-             "");
     }
   else
     print_value (info->value);