* ar.c (usage): Do not use #ifdef inside _("...).

        * nm.c (usage): Likewise.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ddacde192faf2490267476817b68cbc2782f32eb..086df79223e3c3b0575bfae305536d770e4aa736 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-19  Nick Clifton  <nickc@redhat.com>
+
+       * ar.c (usage): Do not use #ifdef inside _("...).
+       * nm.c (usage): Likewise.
+
 2009-06-18  Nick Clifton  <nickc@redhat.com>
 
        PR 10288

diff --git a/binutils/ar.c b/binutils/ar.c
index 318cfe0cc3889750f454c724c97ac5d64fab9aad..4d6a32516a728fa6c2af3e732fecfd454cbbc985 100644 (file)
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -278,11 +278,13 @@ usage (int help)
       fprintf (s, _("Usage: %s [options] archive\n"), program_name);
       fprintf (s, _(" Generate an index to speed access to archives\n"));
       fprintf (s, _(" The options are:\n\
-  @<file>                      Read options from <file>\n"
+  @<file>                      Read options from <file>\n"));
 #if BFD_SUPPORTS_PLUGINS
-"  --plugin <name>              Load the specified plugin\n"
+      fprintf (s, _("\
+  --plugin <name>              Load the specified plugin\n"));
 #endif
-"  -t                           Update the archive's symbol map timestamp\n\
+      fprintf (s, _("\
+  -t                           Update the archive's symbol map timestamp\n\
   -h --help                    Print this help message\n\
   -v --version                 Print version information\n"));
     }

diff --git a/binutils/nm.c b/binutils/nm.c
index 51f67d143130a9c3003de7d9f30bb1df4d29ca72..7ca691daa4c2446c3d2f3231f991fa55ef10ec58 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -240,11 +240,13 @@ usage (FILE *stream, int status)
   -o                     Same as -A\n\
   -p, --no-sort          Do not sort the symbols\n\
   -P, --portability      Same as --format=posix\n\
-  -r, --reverse-sort     Reverse the sense of the sort\n"
+  -r, --reverse-sort     Reverse the sense of the sort\n"));
 #if BFD_SUPPORTS_PLUGINS
-"      --plugin NAME      Load the specified plugin\n"
+  fprintf (stream, _("\
+      --plugin NAME      Load the specified plugin\n"));
 #endif
-"  -S, --print-size       Print size of defined symbols\n\
+  fprintf (stream, _("\
+  -S, --print-size       Print size of defined symbols\n               \
   -s, --print-armap      Include index for symbols from archive members\n\
       --size-sort        Sort symbols by size\n\
       --special-syms     Include special symbols in the output\n\