From 836bf45453d96e2e4020982e1a44e22498d766fa Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 3 Jul 2012 20:09:49 +0000 Subject: [PATCH] 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. --- gdb/ChangeLog | 10 ++++++++++ gdb/dwarf2expr.h | 15 +-------------- gdb/gdbtypes.h | 16 +++++++++++++++- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7ba59f42c2a..1d8fba17a90 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2012-07-03 Jan Kratochvil + + 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 * amd64-linux-tdep.c (linux_sigtramp_code): Renamed to ... diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h index db49b9c5ceb..19efbfd78bb 100644 --- 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 cf7d398bdde..3b4edea21e4 100644 --- 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))) -- 2.30.2