From af0b2512507109cb3ca5dccf3b110e9d883e611b Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 6 Oct 2002 18:37:13 +0000 Subject: [PATCH] * config/i386/nm-i386sco.h: Add protection against multiple-inclusion. Include "i386/nm-i386v.h". (REGISTER_U_ADDR): Remove define. (i386_register_u_addr): Remove prototype. --- gdb/ChangeLog | 7 +++++++ gdb/config/i386/nm-i386sco.h | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6a70cf425d6..60f363cccc6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2002-10-06 Mark Kettenis + + * config/i386/nm-i386sco.h: Add protection against + multiple-inclusion. Include "i386/nm-i386v.h". + (REGISTER_U_ADDR): Remove define. + (i386_register_u_addr): Remove prototype. + 2002-10-04 Michael Snyder * m32r-stub.c (handle_exception): Make sure exception is "trap" diff --git a/gdb/config/i386/nm-i386sco.h b/gdb/config/i386/nm-i386sco.h index e3bdc2df97c..ec7a3bd97d9 100644 --- a/gdb/config/i386/nm-i386sco.h +++ b/gdb/config/i386/nm-i386sco.h @@ -20,12 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = i386_register_u_addr ((blockend),(regno)); +#ifndef NM_I386SCO_H +#define NM_I386SCO_H -extern int i386_register_u_addr (int, int); +#include "i386/nm-i386v.h" /* When calling functions on SCO, sometimes we get an error writing some of the segment registers. This would appear to be a kernel bug/non-feature. */ #define CANNOT_STORE_REGISTER(regno) ((regno) == 14 || (regno) == 15) + +#endif /* nm-i386sco.h */ -- 2.30.2