* hppa-hpux-tdep.c: Do not include <dl.h> or <machine/save_state.h>.

	(offsetof): Do not define.
	(find_stub_with_shl_get): Use numerical value 3 instead of
	symbolic value TYPE_PROCEDURE.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d1486a0..55cc2a6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * hppa-hpux-tdep.c: Do not include <dl.h> or <machine/save_state.h>.
+       (offsetof): Do not define.
+       (find_stub_with_shl_get): Use numerical value 3 instead of
+       symbolic value TYPE_PROCEDURE.
+
 2007-05-14  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * gdb_proc_service.h (paddr_t): Delete typedef.

diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index 05f8d83..ab44e95 100644 (file)
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -40,13 +40,6 @@
 
 #include "gdb_string.h"
 
-#include <dl.h>
-#include <machine/save_state.h>
-
-#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);