This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Do not include py-ref.h in most files
- From: Tom Tromey <tromey at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 23 Jan 2019 03:51:08 -0000
- Subject: [binutils-gdb] Do not include py-ref.h in most files
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3fabc0163acbdffd9d77d7608604f737fc981399
commit 3fabc0163acbdffd9d77d7608604f737fc981399
Author: Tom Tromey <tom@tromey.com>
Date: Mon Jan 21 13:49:06 2019 -0700
Do not include py-ref.h in most files
py-ref.h can really only be included from a specific spot in
python-internal.h. The other includes are not useful, and cause
compilation errors if the includes are ever sorted. So, remove these
includes.
Arguably, py-ref.h should simply not be a separate header.
gdb/ChangeLog
2019-01-22 Tom Tromey <tom@tromey.com>
* python/py-arch.c: Do not include py-ref.h.
* python/py-bpevent.c: Do not include py-ref.h.
* python/py-cmd.c: Do not include py-ref.h.
* python/py-continueevent.c: Do not include py-ref.h.
* python/py-event.h: Do not include py-ref.h.
* python/py-evtregistry.c: Do not include py-ref.h.
* python/py-finishbreakpoint.c: Do not include py-ref.h.
* python/py-frame.c: Do not include py-ref.h.
* python/py-framefilter.c: Do not include py-ref.h.
* python/py-function.c: Do not include py-ref.h.
* python/py-infevents.c: Do not include py-ref.h.
* python/py-linetable.c: Do not include py-ref.h.
* python/py-objfile.c: Do not include py-ref.h.
* python/py-param.c: Do not include py-ref.h.
* python/py-prettyprint.c: Do not include py-ref.h.
* python/py-progspace.c: Do not include py-ref.h.
* python/py-symbol.c: Do not include py-ref.h.
* python/py-symtab.c: Do not include py-ref.h.
* python/py-type.c: Do not include py-ref.h.
* python/py-unwind.c: Do not include py-ref.h.
* python/py-utils.c: Do not include py-ref.h.
* python/py-value.c: Do not include py-ref.h.
* python/py-varobj.c: Do not include py-ref.h.
* python/py-xmethods.c: Do not include py-ref.h.
* python/python.c: Do not include py-ref.h.
* varobj.c: Do not include py-ref.h.
Diff:
---
gdb/ChangeLog | 29 +++++++++++++++++++++++++++++
gdb/python/py-arch.c | 1 -
gdb/python/py-bpevent.c | 1 -
gdb/python/py-cmd.c | 1 -
gdb/python/py-continueevent.c | 1 -
gdb/python/py-event.h | 1 -
gdb/python/py-evtregistry.c | 1 -
gdb/python/py-finishbreakpoint.c | 1 -
gdb/python/py-frame.c | 1 -
gdb/python/py-framefilter.c | 1 -
gdb/python/py-function.c | 1 -
gdb/python/py-infevents.c | 1 -
gdb/python/py-linetable.c | 1 -
gdb/python/py-objfile.c | 1 -
gdb/python/py-param.c | 1 -
gdb/python/py-prettyprint.c | 1 -
gdb/python/py-progspace.c | 1 -
gdb/python/py-symbol.c | 1 -
gdb/python/py-symtab.c | 1 -
gdb/python/py-type.c | 1 -
gdb/python/py-unwind.c | 1 -
gdb/python/py-utils.c | 1 -
gdb/python/py-value.c | 1 -
gdb/python/py-varobj.c | 1 -
gdb/python/py-xmethods.c | 1 -
gdb/python/python.c | 1 -
gdb/varobj.c | 1 -
27 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 02cca05..63b66b0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,34 @@
2019-01-22 Tom Tromey <tom@tromey.com>
+ * python/py-arch.c: Do not include py-ref.h.
+ * python/py-bpevent.c: Do not include py-ref.h.
+ * python/py-cmd.c: Do not include py-ref.h.
+ * python/py-continueevent.c: Do not include py-ref.h.
+ * python/py-event.h: Do not include py-ref.h.
+ * python/py-evtregistry.c: Do not include py-ref.h.
+ * python/py-finishbreakpoint.c: Do not include py-ref.h.
+ * python/py-frame.c: Do not include py-ref.h.
+ * python/py-framefilter.c: Do not include py-ref.h.
+ * python/py-function.c: Do not include py-ref.h.
+ * python/py-infevents.c: Do not include py-ref.h.
+ * python/py-linetable.c: Do not include py-ref.h.
+ * python/py-objfile.c: Do not include py-ref.h.
+ * python/py-param.c: Do not include py-ref.h.
+ * python/py-prettyprint.c: Do not include py-ref.h.
+ * python/py-progspace.c: Do not include py-ref.h.
+ * python/py-symbol.c: Do not include py-ref.h.
+ * python/py-symtab.c: Do not include py-ref.h.
+ * python/py-type.c: Do not include py-ref.h.
+ * python/py-unwind.c: Do not include py-ref.h.
+ * python/py-utils.c: Do not include py-ref.h.
+ * python/py-value.c: Do not include py-ref.h.
+ * python/py-varobj.c: Do not include py-ref.h.
+ * python/py-xmethods.c: Do not include py-ref.h.
+ * python/python.c: Do not include py-ref.h.
+ * varobj.c: Do not include py-ref.h.
+
+2019-01-22 Tom Tromey <tom@tromey.com>
+
* objfiles.h (struct objfile_per_bfd_storage): Use "struct"
keyword for bcache.
diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index cbdd881..23cb2c5 100644
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -22,7 +22,6 @@
#include "arch-utils.h"
#include "disasm.h"
#include "python-internal.h"
-#include "py-ref.h"
typedef struct arch_object_type_object {
PyObject_HEAD
diff --git a/gdb/python/py-bpevent.c b/gdb/python/py-bpevent.c
index 6bdbd8c..64bd50e 100644
--- a/gdb/python/py-bpevent.c
+++ b/gdb/python/py-bpevent.c
@@ -19,7 +19,6 @@
#include "defs.h"
#include "py-stopevent.h"
-#include "py-ref.h"
/* Create and initialize a BreakpointEvent object. This acquires new
references to BREAKPOINT_LIST and FIRST_BP. */
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index bc18cec..1677c3d 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -27,7 +27,6 @@
#include "cli/cli-decode.h"
#include "completer.h"
#include "language.h"
-#include "py-ref.h"
/* Struct representing built-in completion types. */
struct cmdpy_completer
diff --git a/gdb/python/py-continueevent.c b/gdb/python/py-continueevent.c
index eb17766..b9de197 100644
--- a/gdb/python/py-continueevent.c
+++ b/gdb/python/py-continueevent.c
@@ -19,7 +19,6 @@
#include "defs.h"
#include "py-event.h"
-#include "py-ref.h"
#include "gdbthread.h"
/* Create a gdb.ContinueEvent event. gdb.ContinueEvent is-a
diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h
index f4a9101..07b99d2 100644
--- a/gdb/python/py-event.h
+++ b/gdb/python/py-event.h
@@ -24,7 +24,6 @@
#include "command.h"
#include "python-internal.h"
#include "inferior.h"
-#include "py-ref.h"
/* Declare all event types. */
#define GDB_PY_DEFINE_EVENT_TYPE(name, py_name, doc, base) \
diff --git a/gdb/python/py-evtregistry.c b/gdb/python/py-evtregistry.c
index 941fe9d..cf3505e 100644
--- a/gdb/python/py-evtregistry.c
+++ b/gdb/python/py-evtregistry.c
@@ -20,7 +20,6 @@
#include "defs.h"
#include "command.h"
#include "py-events.h"
-#include "py-ref.h"
events_object gdb_py_events;
diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c
index 6ad79cd..f3affbd 100644
--- a/gdb/python/py-finishbreakpoint.c
+++ b/gdb/python/py-finishbreakpoint.c
@@ -30,7 +30,6 @@
#include "inferior.h"
#include "block.h"
#include "location.h"
-#include "py-ref.h"
/* Function that is called when a Python finish bp is found out of scope. */
static const char outofscope_func[] = "out_of_scope";
diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index 88a50e7..0eef654 100644
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -28,7 +28,6 @@
#include "symfile.h"
#include "objfiles.h"
#include "user-regs.h"
-#include "py-ref.h"
typedef struct {
PyObject_HEAD
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index c078e94..7f416cb 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -30,7 +30,6 @@
#include "demangle.h"
#include "mi/mi-cmds.h"
#include "python-internal.h"
-#include "py-ref.h"
#include "common/gdb_optional.h"
enum mi_print_types
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index dbd5649..46a66cf 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -27,7 +27,6 @@
#include "completer.h"
#include "expression.h"
#include "language.h"
-#include "py-ref.h"
extern PyTypeObject fnpy_object_type
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("PyObject");
diff --git a/gdb/python/py-infevents.c b/gdb/python/py-infevents.c
index dc27e0d..60bafc5 100644
--- a/gdb/python/py-infevents.c
+++ b/gdb/python/py-infevents.c
@@ -19,7 +19,6 @@
#include "defs.h"
#include "py-event.h"
-#include "py-ref.h"
/* Construct either a gdb.InferiorCallPreEvent or a
gdb.InferiorCallPostEvent. */
diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c
index a11a8d8..b9d74b8 100644
--- a/gdb/python/py-linetable.c
+++ b/gdb/python/py-linetable.c
@@ -19,7 +19,6 @@
#include "defs.h"
#include "python-internal.h"
-#include "py-ref.h"
typedef struct {
PyObject_HEAD
diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
index efad007..67f63b3 100644
--- a/gdb/python/py-objfile.c
+++ b/gdb/python/py-objfile.c
@@ -24,7 +24,6 @@
#include "language.h"
#include "build-id.h"
#include "symtab.h"
-#include "py-ref.h"
typedef struct
{
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index 5fd4360..3b79a5c 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -27,7 +27,6 @@
#include "completer.h"
#include "language.h"
#include "arch-utils.h"
-#include "py-ref.h"
/* Parameter constants and their values. */
struct parm_constant
diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index ae3001e..8effa81 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -25,7 +25,6 @@
#include "extension-priv.h"
#include "python.h"
#include "python-internal.h"
-#include "py-ref.h"
/* Return type of print_string_repr. */
diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index b80b2c2..b82a91b 100644
--- a/gdb/python/py-progspace.c
+++ b/gdb/python/py-progspace.c
@@ -24,7 +24,6 @@
#include "objfiles.h"
#include "language.h"
#include "arch-utils.h"
-#include "py-ref.h"
#include "solib.h"
#include "block.h"
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 6166757..afff995 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -23,7 +23,6 @@
#include "symtab.h"
#include "python-internal.h"
#include "objfiles.h"
-#include "py-ref.h"
typedef struct sympy_symbol_object {
PyObject_HEAD
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c
index a5f376a..0fef6e4 100644
--- a/gdb/python/py-symtab.c
+++ b/gdb/python/py-symtab.c
@@ -24,7 +24,6 @@
#include "python-internal.h"
#include "objfiles.h"
#include "block.h"
-#include "py-ref.h"
typedef struct stpy_symtab_object {
PyObject_HEAD
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index fff3d30..18c1598 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -28,7 +28,6 @@
#include "language.h"
#include "vec.h"
#include "typeprint.h"
-#include "py-ref.h"
typedef struct pyty_type_object
{
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 5fc555e..f07a8d8 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -28,7 +28,6 @@
#include "regcache.h"
#include "valprint.h"
#include "user-regs.h"
-#include "py-ref.h"
#define TRACE_PY_UNWIND(level, args...) if (pyuw_debug >= level) \
{ fprintf_unfiltered (gdb_stdlog, args); }
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c
index 0f838c2..0f96aab 100644
--- a/gdb/python/py-utils.c
+++ b/gdb/python/py-utils.c
@@ -21,7 +21,6 @@
#include "charset.h"
#include "value.h"
#include "python-internal.h"
-#include "py-ref.h"
/* Converts a Python 8-bit string to a unicode string object. Assumes the
8-bit string is in the host charset. If an error occurs during conversion,
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index ebd7ef1..20ef582 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -29,7 +29,6 @@
#include "python.h"
#include "python-internal.h"
-#include "py-ref.h"
/* Even though Python scalar types directly map to host types, we use
target types here to remain consistent with the values system in
diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c
index 274b2de..611c4ca 100644
--- a/gdb/python/py-varobj.c
+++ b/gdb/python/py-varobj.c
@@ -17,7 +17,6 @@
#include "python-internal.h"
#include "varobj.h"
#include "varobj-iter.h"
-#include "py-ref.h"
/* A dynamic varobj iterator "class" for python pretty-printed
varobjs. This inherits struct varobj_iter. */
diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c
index 2e0b2bb..8606f40 100644
--- a/gdb/python/py-xmethods.c
+++ b/gdb/python/py-xmethods.c
@@ -26,7 +26,6 @@
#include "python.h"
#include "python-internal.h"
-#include "py-ref.h"
static const char enabled_field_name[] = "enabled";
static const char match_method_name[] = "match";
diff --git a/gdb/python/python.c b/gdb/python/python.c
index d8505e9..eafcc04 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -98,7 +98,6 @@ const struct extension_language_defn extension_language_python =
#include "gdbthread.h"
#include "interps.h"
#include "event-top.h"
-#include "py-ref.h"
#include "py-event.h"
/* True if Python has been successfully initialized, false
diff --git a/gdb/varobj.c b/gdb/varobj.c
index f43910e..ca43a8f 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -35,7 +35,6 @@
#if HAVE_PYTHON
#include "python/python.h"
#include "python/python-internal.h"
-#include "python/py-ref.h"
#else
typedef int PyObject;
#endif