diff options
author | Gary Benson <gbenson@redhat.com> | 2014-09-12 10:11:42 +0100 |
---|---|---|
committer | Gary Benson <gbenson@redhat.com> | 2014-09-12 10:11:42 +0100 |
commit | 727605ca75e009d8468bb6378b7d18b774838b2d (patch) | |
tree | e3ae51da620ae399d975a28028f26d1e2b693727 /gdb | |
parent | 361c8ade9c3c88cf7f0111fdab3ceb03028842bc (diff) | |
download | fsf-binutils-gdb-727605ca75e009d8468bb6378b7d18b774838b2d.zip fsf-binutils-gdb-727605ca75e009d8468bb6378b7d18b774838b2d.tar.gz fsf-binutils-gdb-727605ca75e009d8468bb6378b7d18b774838b2d.tar.bz2 |
Include common-defs.h instead of defs.h/server.h in shared code
This commit makes 19 of the 22 shared .c files in common, nat and
target include common-defs.h instead of defs.h/server.h. The
remaining three files need slight extra work and are dealt with
in separate commits.
gdb/ChangeLog:
* common/agent.c: Include common-defs.h.
Don't include defs.h or server.h.
* common/buffer.c: Likewise.
* common/common-debug.c: Likewise.
* common/common-utils.c: Likewise.
* common/errors.c: Likewise.
* common/filestuff.c: Likewise.
* common/format.c: Likewise.
* common/gdb_vecs.c: Likewise.
* common/print-utils.c: Likewise.
* common/ptid.c: Likewise.
* common/rsp-low.c: Likewise.
* common/signals.c: Likewise.
* common/vec.c: Likewise.
* common/xml-utils.c: Likewise.
* nat/linux-osdata.c: Likewise.
* nat/linux-procfs.c: Likewise.
* nat/linux-ptrace.c: Likewise.
* nat/mips-linux-watch.c: Likewise.
* target/waitstatus.c: Likewise.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 23 | ||||
-rw-r--r-- | gdb/common/agent.c | 6 | ||||
-rw-r--r-- | gdb/common/buffer.c | 7 | ||||
-rw-r--r-- | gdb/common/common-debug.c | 6 | ||||
-rw-r--r-- | gdb/common/common-utils.c | 6 | ||||
-rw-r--r-- | gdb/common/errors.c | 6 | ||||
-rw-r--r-- | gdb/common/filestuff.c | 6 | ||||
-rw-r--r-- | gdb/common/format.c | 7 | ||||
-rw-r--r-- | gdb/common/gdb_vecs.c | 7 | ||||
-rw-r--r-- | gdb/common/print-utils.c | 7 | ||||
-rw-r--r-- | gdb/common/ptid.c | 6 | ||||
-rw-r--r-- | gdb/common/rsp-low.c | 7 | ||||
-rw-r--r-- | gdb/common/signals.c | 6 | ||||
-rw-r--r-- | gdb/common/vec.c | 7 | ||||
-rw-r--r-- | gdb/common/xml-utils.c | 7 | ||||
-rw-r--r-- | gdb/nat/linux-osdata.c | 7 | ||||
-rw-r--r-- | gdb/nat/linux-procfs.c | 7 | ||||
-rw-r--r-- | gdb/nat/linux-ptrace.c | 7 | ||||
-rw-r--r-- | gdb/nat/mips-linux-watch.c | 6 | ||||
-rw-r--r-- | gdb/target/waitstatus.c | 7 |
20 files changed, 42 insertions, 106 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 96d65ae..2e18116 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,26 @@ +2014-09-12 Gary Benson <gbenson@redhat.com> + + * common/agent.c: Include common-defs.h. + Don't include defs.h or server.h. + * common/buffer.c: Likewise. + * common/common-debug.c: Likewise. + * common/common-utils.c: Likewise. + * common/errors.c: Likewise. + * common/filestuff.c: Likewise. + * common/format.c: Likewise. + * common/gdb_vecs.c: Likewise. + * common/print-utils.c: Likewise. + * common/ptid.c: Likewise. + * common/rsp-low.c: Likewise. + * common/signals.c: Likewise. + * common/vec.c: Likewise. + * common/xml-utils.c: Likewise. + * nat/linux-osdata.c: Likewise. + * nat/linux-procfs.c: Likewise. + * nat/linux-ptrace.c: Likewise. + * nat/mips-linux-watch.c: Likewise. + * target/waitstatus.c: Likewise. + 2014-09-12 Tom Tromey <tromey@redhat.com> Gary Benson <gbenson@redhat.com> diff --git a/gdb/common/agent.c b/gdb/common/agent.c index 433ae2a..854a997 100644 --- a/gdb/common/agent.c +++ b/gdb/common/agent.c @@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "target/target.h" #include "common/symbol.h" #include <unistd.h> diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c index 4a213b33..d6afb6a 100644 --- a/gdb/common/buffer.c +++ b/gdb/common/buffer.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "xml-utils.h" #include "buffer.h" #include "inttypes.h" diff --git a/gdb/common/common-debug.c b/gdb/common/common-debug.c index 5cac3bf..933d436 100644 --- a/gdb/common/common-debug.c +++ b/gdb/common/common-debug.c @@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "common-debug.h" /* See common/common-debug.h. */ diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c index a905d1d..3b8237e 100644 --- a/gdb/common/common-utils.c +++ b/gdb/common/common-utils.c @@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" /* The xmalloc() (libiberty.h) family of memory management routines. diff --git a/gdb/common/errors.c b/gdb/common/errors.c index d6e17a8..089c64b 100644 --- a/gdb/common/errors.c +++ b/gdb/common/errors.c @@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "errors.h" /* See common/errors.h. */ diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c index a31ecd7..7ee9c5a 100644 --- a/gdb/common/filestuff.c +++ b/gdb/common/filestuff.c @@ -16,11 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "filestuff.h" #include "gdb_vecs.h" #include <fcntl.h> diff --git a/gdb/common/format.c b/gdb/common/format.c index 247aaff..b989dc7 100644 --- a/gdb/common/format.c +++ b/gdb/common/format.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "format.h" struct format_piece * diff --git a/gdb/common/gdb_vecs.c b/gdb/common/gdb_vecs.c index 4a3330f..ae11cc6 100644 --- a/gdb/common/gdb_vecs.c +++ b/gdb/common/gdb_vecs.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "gdb_vecs.h" #include "host-defs.h" diff --git a/gdb/common/print-utils.c b/gdb/common/print-utils.c index f5bef0a..820ade0 100644 --- a/gdb/common/print-utils.c +++ b/gdb/common/print-utils.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "print-utils.h" #include <stdint.h> diff --git a/gdb/common/ptid.c b/gdb/common/ptid.c index 04fd118..84e4aa7 100644 --- a/gdb/common/ptid.c +++ b/gdb/common/ptid.c @@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "ptid.h" /* See ptid.h for these. */ diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c index 0263005..e88799a 100644 --- a/gdb/common/rsp-low.c +++ b/gdb/common/rsp-low.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "rsp-low.h" /* See rsp-low.h. */ diff --git a/gdb/common/signals.c b/gdb/common/signals.c index 13d1e2c..ebe2761 100644 --- a/gdb/common/signals.c +++ b/gdb/common/signals.c @@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #ifdef HAVE_SIGNAL_H #include <signal.h> diff --git a/gdb/common/vec.c b/gdb/common/vec.c index 4611e5f..9fc6915 100644 --- a/gdb/common/vec.c +++ b/gdb/common/vec.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "vec.h" struct vec_prefix diff --git a/gdb/common/xml-utils.c b/gdb/common/xml-utils.c index 0f81390..b90dd21 100644 --- a/gdb/common/xml-utils.c +++ b/gdb/common/xml-utils.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "xml-utils.h" /* Return a malloc allocated string with special characters from TEXT diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c index 887e518..3f72883 100644 --- a/gdb/nat/linux-osdata.c +++ b/gdb/nat/linux-osdata.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "linux-osdata.h" #include <sys/types.h> diff --git a/gdb/nat/linux-procfs.c b/gdb/nat/linux-procfs.c index 84fc890..30797da 100644 --- a/gdb/nat/linux-procfs.c +++ b/gdb/nat/linux-procfs.c @@ -16,12 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "linux-procfs.h" #include "filestuff.h" diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c index b4db862..6275516 100644 --- a/gdb/nat/linux-ptrace.c +++ b/gdb/nat/linux-ptrace.c @@ -16,12 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "linux-ptrace.h" #include "linux-procfs.h" #include "linux-waitpid.h" diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c index ea6e02d..afa3d78 100644 --- a/gdb/nat/mips-linux-watch.c +++ b/gdb/nat/mips-linux-watch.c @@ -15,11 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include <sys/ptrace.h> #include "mips-linux-watch.h" diff --git a/gdb/target/waitstatus.c b/gdb/target/waitstatus.c index 4493555..717f47a 100644 --- a/gdb/target/waitstatus.c +++ b/gdb/target/waitstatus.c @@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "waitstatus.h" /* Return a pretty printed form of target_waitstatus. |