* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a70cf425d6987ba71507367482d355e63a3d560..60f363cccc6a5440d32cfd0b0fc5161d6a9d136a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-06  Mark Kettenis  <kettenis@gnu.org>
+
+       * 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  <msnyder@redhat.com>
 
        * 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 e3bdc2df97c4c89d5187845b39708d0416b981b7..ec7a3bd97d98c11d87651cfa39ef71d851822c45 100644 (file)
--- 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 */