* common/signals.c (target_signal_from_host): Add _ markup to error

[deliverable/binutils-gdb.git] / gdb / gdbserver / server.h

diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 5ade77d396c803cbdc64601628bb59a5949c727c..77f5dd6e42000fde9f94d188bfe5e3293625a6e1 100644 (file)
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -71,7 +71,8 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif
 
 #ifndef ATTR_NORETURN
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
+#if defined(__GNUC__) && (__GNUC__ > 2 \
+                         || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
 #define ATTR_NORETURN __attribute__ ((noreturn))
 #else
 #define ATTR_NORETURN           /* nothing */
@@ -79,7 +80,8 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif
 
 #ifndef ATTR_FORMAT
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 4))
+#if defined(__GNUC__) && (__GNUC__ > 2 \
+                         || (__GNUC__ == 2 && __GNUC_MINOR__ >= 4))
 #define ATTR_FORMAT(type, x, y) __attribute__ ((format(type, x, y)))
 #else
 #define ATTR_FORMAT(type, x, y) /* nothing */
@@ -94,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;
 
@@ -421,13 +429,14 @@ void decode_M_packet (char *from, CORE_ADDR * mem_addr_ptr,
                      unsigned int *len_ptr, unsigned char **to_p);
 int decode_X_packet (char *from, int packet_len, CORE_ADDR * mem_addr_ptr,
                     unsigned int *len_ptr, unsigned char **to_p);
-int decode_xfer_write (char *buf, int packet_len, char **annex,
+int decode_xfer_write (char *buf, int packet_len,
                       CORE_ADDR *offset, unsigned int *len,
                       unsigned char *data);
 int decode_search_memory_packet (const char *buf, int packet_len,
                                 CORE_ADDR *start_addrp,
                                 CORE_ADDR *search_space_lenp,
-                                gdb_byte *pattern, unsigned int *pattern_lenp);
+                                gdb_byte *pattern,
+                                unsigned int *pattern_lenp);
 
 int unhexify (char *bin, const char *hex, int count);
 int hexify (char *hex, const char *bin, int count);
@@ -572,6 +581,8 @@ int traceframe_read_sdata (int tfnum, ULONGEST offset,
                           unsigned char *buf, ULONGEST length,
                           ULONGEST *nbytes);
 
+int traceframe_read_info (int tfnum, struct buffer *buffer);
+
 /* If a thread is determined to be collecting a fast tracepoint, this
    structure holds the collect status.  */