gdb/

	Fix 'warning: parameter has incomplete type' with gcc-3.4.6.
	* dwarf2expr.h: Include gdbtypes.h.
	(enum call_site_parameter_kind, union call_site_parameter_u): Remove
	these forward declarations.
	(cu_offset, sect_offset): Move these ...
	* gdbtypes.h: Remove include dwarf2expr.h.
	(cu_offset, sect_offset): ... here.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ba59f42c2a8519f7b0a3270d8b3de072710d6a8..1d8fba17a90f20117d77b1cb26f368fb52c6c2a4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Fix 'warning: parameter has incomplete type' with gcc-3.4.6.
+       * dwarf2expr.h: Include gdbtypes.h.
+       (enum call_site_parameter_kind, union call_site_parameter_u): Remove
+       these forward declarations.
+       (cu_offset, sect_offset): Move these ...
+       * gdbtypes.h: Remove include dwarf2expr.h.
+       (cu_offset, sect_offset): ... here.
+
 2012-07-03  H.J. Lu  <hongjiu.lu@intel.com>
 
        * amd64-linux-tdep.c (linux_sigtramp_code): Renamed to ...

diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h
index db49b9c5cebca1f9bbb2c9085fdd6e08083c0f41..19efbfd78bbbce4f2857ac522f5c8ad4e0c59416 100644 (file)
--- a/gdb/dwarf2expr.h
+++ b/gdb/dwarf2expr.h
@@ -24,22 +24,9 @@
 #define DWARF2EXPR_H
 
 #include "leb128.h"
+#include "gdbtypes.h"
 
 struct dwarf_expr_context;
-enum call_site_parameter_kind;
-union call_site_parameter_u;
-
-/* Offset relative to the start of its containing CU (compilation unit).  */
-typedef struct
-{
-  unsigned int cu_off;
-} cu_offset;
-
-/* Offset relative to the start of its .debug_info or .debug_types section.  */
-typedef struct
-{
-  unsigned int sect_off;
-} sect_offset;
 
 /* Virtual method table for struct dwarf_expr_context below.  */
 

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index cf7d398bdde9dbee5babed9273fd4c201ec8f789..3b4edea21e4b9682faf285d1d3059e318f3a1fc4 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -23,7 +23,6 @@
 #define GDBTYPES_H 1
 
 #include "hashtab.h"
-#include "dwarf2expr.h"
 
 /* Forward declarations for prototypes.  */
 struct field;
@@ -31,6 +30,21 @@ struct block;
 struct value_print_options;
 struct language_defn;
 
+/* These declarations are DWARF-specific as some of the gdbtypes.h data types
+   are already DWARF-specific.  */
+
+/* Offset relative to the start of its containing CU (compilation unit).  */
+typedef struct
+{
+  unsigned int cu_off;
+} cu_offset;
+
+/* Offset relative to the start of its .debug_info or .debug_types section.  */
+typedef struct
+{
+  unsigned int sect_off;
+} sect_offset;
+
 /* Some macros for char-based bitfields.  */
 
 #define B_SET(a,x)     ((a)[(x)>>3] |= (1 << ((x)&7)))