From 1cce71eb0e2e113c808744390ab0671a9ceca746 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@gnat.com>
Date: Fri, 16 Aug 2002 22:44:00 +0000
Subject: [PATCH]         * i386-tdep.c (i386_pe_skip_trampoline_code): renamed
 from         skip_trampoline_code, for better namespace-proofing.

        * i386-tdep.h (i386_pe_skip_trampoline_code): Add declaration.
---
 gdb/ChangeLog   | 7 +++++++
 gdb/i386-tdep.c | 2 +-
 gdb/i386-tdep.h | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4e51c27ad3c..1d30d69c926 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-16  Joel Brobecker  <brobecker@gnat.com>
+
+	* i386-tdep.c (i386_pe_skip_trampoline_code): renamed from
+	skip_trampoline_code, for better namespace-proofing.   
+
+	* i386-tdep.h (i386_pe_skip_trampoline_code): Add declaration.
+
 2002-08-16  Joel Brobecker  <brobecker@gnat.com>
 
 	* config/i386/tm-cygwin.h: Remove some "#if 0"'ed macros.
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 39d3bddda34..251dff0ad2e 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -1254,7 +1254,7 @@ sunpro_static_transform_name (char *name)
 /* Stuff for WIN32 PE style DLL's but is pretty generic really.  */
 
 CORE_ADDR
-skip_trampoline_code (CORE_ADDR pc, char *name)
+i386_pe_skip_trampoline_code (CORE_ADDR pc, char *name)
 {
   if (pc && read_memory_unsigned_integer (pc, 2) == 0x25ff) /* jmp *(dest) */
     {
diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
index 1fa64133012..8f5c13ca319 100644
--- a/gdb/i386-tdep.h
+++ b/gdb/i386-tdep.h
@@ -160,6 +160,9 @@ struct gdbarch_tdep
 /* Size of the largest register.  */
 #define I386_MAX_REGISTER_SIZE	16
 
+/* Functions exported from i386-tdep.c.  */
+extern CORE_ADDR i386_pe_skip_trampoline_code (CORE_ADDR pc, char *name);
+
 /* Return the name of register REG.  */
 extern char const *i386_register_name (int reg);