From patchwork Fri Aug 1 10:19:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2275 Received: (qmail 31868 invoked by alias); 1 Aug 2014 10:27:30 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 31736 invoked by uid 89); 1 Aug 2014 10:27:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 01 Aug 2014 10:27:22 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s71AJmX3032274 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 Aug 2014 06:19:48 -0400 Received: from blade.nx (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s71AJkdS009062; Fri, 1 Aug 2014 06:19:47 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id D2A932640DD; Fri, 1 Aug 2014 11:19:44 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Doug Evans , Pedro Alves , Tom Tromey Subject: [PATCH 08/11 v5] Include common-defs.h instead of defs.h/server.h in shared code Date: Fri, 1 Aug 2014 11:19:34 +0100 Message-Id: <1406888377-25795-9-git-send-email-gbenson@redhat.com> In-Reply-To: <1406888377-25795-1-git-send-email-gbenson@redhat.com> References: <1406888377-25795-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes 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/ 2014-08-01 Gary Benson * 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. --- gdb/ChangeLog | 23 +++++++++++++++++++++++ gdb/common/agent.c | 6 +----- gdb/common/buffer.c | 7 +------ gdb/common/common-debug.c | 6 +----- gdb/common/common-utils.c | 6 +----- gdb/common/errors.c | 6 +----- gdb/common/filestuff.c | 6 +----- gdb/common/format.c | 7 +------ gdb/common/gdb_vecs.c | 7 +------ gdb/common/print-utils.c | 7 +------ gdb/common/ptid.c | 6 +----- gdb/common/rsp-low.c | 7 +------ gdb/common/signals.c | 6 +----- gdb/common/vec.c | 7 +------ gdb/common/xml-utils.c | 7 +------ gdb/nat/linux-osdata.c | 7 +------ gdb/nat/linux-procfs.c | 7 +------ gdb/nat/linux-ptrace.c | 7 +------ gdb/nat/mips-linux-watch.c | 6 +----- gdb/target/waitstatus.c | 7 +------ 20 files changed, 42 insertions(+), 106 deletions(-) diff --git a/gdb/common/agent.c b/gdb/common/agent.c index d68e50e..8b90c4d 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 . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "target/target.h" #include "target/symbol.h" #include diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c index 4a213b3..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 . */ -#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 660fc70..22f6a8a 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 . */ -#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 . */ -#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 7d0bb6e..6da2666 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 . */ -#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 . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include "filestuff.h" #include "gdb_vecs.h" #include 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 . */ -#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 . */ -#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 . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "print-utils.h" #include 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 . */ -#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 . */ -#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 . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #ifdef HAVE_SIGNAL_H #include 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 . */ -#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 . */ -#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 . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - +#include "common-defs.h" #include "linux-osdata.h" #include 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 . */ -#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 . */ -#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 . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif +#include "common-defs.h" #include #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 . */ -#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.