From f5ce4941f0497889c400ff62b087e28077e8b0fd Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 14 May 2007 21:35:25 +0000 Subject: [PATCH] * hppa-hpux-tdep.c: Do not include or . (offsetof): Do not define. (find_stub_with_shl_get): Use numerical value 3 instead of symbolic value TYPE_PROCEDURE. --- gdb/ChangeLog | 7 +++++++ gdb/hppa-hpux-tdep.c | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1486a0754b..55cc2a6b81b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2007-05-14 Ulrich Weigand + + * hppa-hpux-tdep.c: Do not include or . + (offsetof): Do not define. + (find_stub_with_shl_get): Use numerical value 3 instead of + symbolic value TYPE_PROCEDURE. + 2007-05-14 Daniel Jacobowitz * gdb_proc_service.h (paddr_t): Delete typedef. diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c index 05f8d838a62..ab44e954374 100644 --- a/gdb/hppa-hpux-tdep.c +++ b/gdb/hppa-hpux-tdep.c @@ -40,13 +40,6 @@ #include "gdb_string.h" -#include -#include - -#ifndef offsetof -#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) -#endif - #define IS_32BIT_TARGET(_gdbarch) \ ((gdbarch_tdep (_gdbarch))->bytes_per_address == 4) @@ -721,7 +714,7 @@ find_stub_with_shl_get (struct minimal_symbol *function, CORE_ADDR handle) args[0] = value_from_longest (TYPE_FIELD_TYPE (ftype, 0), 12); args[1] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 1), SYMBOL_VALUE_ADDRESS (msymbol)); args[2] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 2), endo_buff_addr); - args[3] = value_from_longest (TYPE_FIELD_TYPE (ftype, 3), TYPE_PROCEDURE); + args[3] = value_from_longest (TYPE_FIELD_TYPE (ftype, 3), 3 /* TYPE_PROCEDURE */); args[4] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 4), value_return_addr); args[5] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 5), errno_return_addr); -- 2.30.2