* cli/cli-decode.h: Don't include "gdb_regex.h"; provide a forward

declaration for `struct re_pattern_buffer' instead.
* Makefile.in (cli_decode_h): Remove $(gdb_regex_h).

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 96aa09ebfeec17a0478386ff7d5bc03fc70d6d42..241afeb52602cf9250c97f1e5aabb1b0472208b7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-03  Mark Kettenis  <kettenis@gnu.org>
+
+       * cli/cli-decode.h: Don't include "gdb_regex.h"; provide a forward
+       declaration for `struct re_pattern_buffer' instead.
+       * Makefile.in (cli_decode_h): Remove $(gdb_regex_h).
+
 2003-01-03  J. Brobecker  <brobecker@gnat.com>
 
        * mdebugread.c (parse_symbol): Count until the stEnd matching

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a36ce57f6078d2f6ddccb426a1d79082d66c4773..843c05f898b707dfba422b96f26a83a09c865349 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -717,7 +717,7 @@ xmodem_h = xmodem.h
 #
 
 cli_cmds_h = $(srcdir)/cli/cli-cmds.h
-cli_decode_h = $(srcdir)/cli/cli-decode.h $(gdb_regex_h) $(command_h)
+cli_decode_h = $(srcdir)/cli/cli-decode.h $(command_h)
 cli_dump_h = $(srcdir)/cli/cli-dump.h
 cli_script_h = $(srcdir)/cli/cli-script.h
 cli_setshow_h = $(srcdir)/cli/cli-setshow.h

diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index e8563ff5c59d57317f2143e2a01dbc933c4568b8..cb54721564e474097e33e2d1057ee089a3dbc3fc 100644 (file)
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -19,9 +19,10 @@
 #if !defined (CLI_DECODE_H)
 #define CLI_DECODE_H 1
 
-#include "gdb_regex.h"         /* Needed by apropos_cmd.  */
 #include "command.h"
 
+struct re_pattern_buffer;
+
 #if 0
 /* FIXME: cagney/2002-03-17: Once cmd_type() has been removed, ``enum
    cmd_types'' can be moved from "command.h" to "cli-decode.h".  */