From 9e0627f141ce528d1cbc20c01e6adbc3353f7a0a Mon Sep 17 00:00:00 2001
From: Pierre Muller <muller@sourceware.org>
Date: Fri, 18 Mar 2011 13:03:31 +0000
Subject: [PATCH] 	* common/signals.c (target_signal_from_host): Add _
 markup to error 	function call message. 	(target_signal_to_host): Add _
 markup and remove trailing new line 	from warning call message. 
 (target_signal_from_command): Add _ markup to error function call 
 message. 	* gdbserver/server.h (Macro _): Define it if not available.

---
 gdb/common/signals.c    | 10 +++++-----
 gdb/gdbserver/ChangeLog |  4 ++++
 gdb/gdbserver/server.h  |  6 ++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/gdb/common/signals.c b/gdb/common/signals.c
index 3c7ffe4d53..55f708493d 100644
--- a/gdb/common/signals.c
+++ b/gdb/common/signals.c
@@ -349,8 +349,8 @@ target_signal_from_host (int hostsig)
 	return (enum target_signal)
 	  (hostsig - 64 + (int) TARGET_SIGNAL_REALTIME_64);
       else
-	error ("GDB bug: target.c (target_signal_from_host): "
-	       "unrecognized real-time signal");
+	error (_("GDB bug: target.c (target_signal_from_host): "
+	       "unrecognized real-time signal"));
     }
 #endif
 
@@ -644,7 +644,7 @@ target_signal_to_host (enum target_signal oursig)
     {
       /* The user might be trying to do "signal SIGSAK" where this system
          doesn't have SIGSAK.  */
-      warning ("Signal %s does not exist on this system.\n",
+      warning (_("Signal %s does not exist on this system."),
 	       target_signal_to_name (oursig));
       return 0;
     }
@@ -667,8 +667,8 @@ target_signal_from_command (int num)
 {
   if (num >= 1 && num <= 15)
     return (enum target_signal) num;
-  error ("Only signals 1-15 are valid as numeric signals.\n\
-Use \"info signals\" for a list of symbolic signals.");
+  error (_("Only signals 1-15 are valid as numeric signals.\n\
+Use \"info signals\" for a list of symbolic signals."));
 }
 
 extern initialize_file_ftype _initialize_signals; /* -Wmissing-prototype */
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4f1ea87b7c..33d080fbea 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-18  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* gdbserver/server.h (Macro _): Define it if not available.
+
 2011-03-14  Michael Snyder  <msnyder@vmware.com>
 
 	* hostio.c (handle_close): Remove unnecessary null test.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 53f4e0d17d..77f5dd6e42 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -96,6 +96,12 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif
 #endif
 
+/* Define underscore macro, if not available, to be able to use it inside
+   code shared with gdb in common directory.  */
+#ifndef _
+#define _(String) (String)
+#endif
+
 /* A type used for binary buffers.  */
 typedef unsigned char gdb_byte;