From patchwork Thu Jul 31 12:30:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2255 Received: (qmail 21449 invoked by alias); 31 Jul 2014 12:30:47 -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 21436 invoked by uid 89); 31 Jul 2014 12:30:47 -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; Thu, 31 Jul 2014 12:30:45 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6VCUiQQ012714 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 31 Jul 2014 08:30:44 -0400 Received: from blade.nx (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6VCUh0U027042 for ; Thu, 31 Jul 2014 08:30:43 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id C069B2640C7 for ; Thu, 31 Jul 2014 13:30:42 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [OB PATCH] Do not include defs.h or server.h in any header file Date: Thu, 31 Jul 2014 13:30:42 +0100 Message-Id: <1406809842-18372-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes Hi all, This commit removes all inclusions of defs.h and server.h from header files. I'm pushing this as obvious because: a) The coding standard says all .c files should include defs.h or server.h first. b) I pushed a commit yesterday that fixed up everywhere this wasn't the case. Cheers, Gary gdb/ 2014-07-31 Gary Benson * common/btrace-common.h: Do not include defs.h or server.h. * nat/mips-linux-watch.h: Likewise. * gdb-dlfcn.h: Do not include defs.h. * tracefile.h: Likewise. gdb/gdbserver/ 2014-07-31 Gary Benson * ax.h: Do not include server.h. * gdbthread.h: Likewise. * lynx-low.h: Likewise. * notif.h: Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/common/btrace-common.h | 6 ------ gdb/gdb-dlfcn.h | 2 -- gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/ax.h | 1 - gdb/gdbserver/gdbthread.h | 1 - gdb/gdbserver/lynx-low.h | 2 -- gdb/gdbserver/notif.h | 1 - gdb/nat/mips-linux-watch.h | 6 ------ gdb/tracefile.h | 1 - 10 files changed, 14 insertions(+), 20 deletions(-) diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h index 25617bb..339e684 100644 --- a/gdb/common/btrace-common.h +++ b/gdb/common/btrace-common.h @@ -26,12 +26,6 @@ inferior. For presentation purposes, the branch trace is represented as a list of sequential control-flow blocks, one such list per thread. */ -#ifdef GDBSERVER -# include "server.h" -#else -# include "defs.h" -#endif - #include "vec.h" /* A branch trace block. diff --git a/gdb/gdb-dlfcn.h b/gdb/gdb-dlfcn.h index afc1a25..905015a 100644 --- a/gdb/gdb-dlfcn.h +++ b/gdb/gdb-dlfcn.h @@ -20,8 +20,6 @@ #ifndef GDB_DLFCN_H #define GDB_DLFCN_H -#include "defs.h" - /* Load the dynamic library file named FILENAME, and return a handle for that dynamic library. Return NULL if the loading fails for any reason. */ diff --git a/gdb/gdbserver/ax.h b/gdb/gdbserver/ax.h index 6318004..59005e0 100644 --- a/gdb/gdbserver/ax.h +++ b/gdb/gdbserver/ax.h @@ -19,7 +19,6 @@ #if !defined (AX_H) #define AX_H 1 -#include "server.h" #include "regcache.h" #ifdef IN_PROCESS_AGENT diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h index 9785d67..fe0a75e 100644 --- a/gdb/gdbserver/gdbthread.h +++ b/gdb/gdbserver/gdbthread.h @@ -19,7 +19,6 @@ #ifndef GDB_THREAD_H #define GDB_THREAD_H -#include "server.h" #include "inferiors.h" struct btrace_target_info; diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h index 94a079e..966ec03 100644 --- a/gdb/gdbserver/lynx-low.h +++ b/gdb/gdbserver/lynx-low.h @@ -15,8 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "server.h" - struct regcache; struct target_desc; diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h index 3d233a1..c6a790d 100644 --- a/gdb/gdbserver/notif.h +++ b/gdb/gdbserver/notif.h @@ -17,7 +17,6 @@ along with this program. If not, see . */ #include "ptid.h" -#include "server.h" #include "target.h" #include "queue.h" diff --git a/gdb/nat/mips-linux-watch.h b/gdb/nat/mips-linux-watch.h index c9f6932..0992102 100644 --- a/gdb/nat/mips-linux-watch.h +++ b/gdb/nat/mips-linux-watch.h @@ -18,12 +18,6 @@ #ifndef MIPS_LINUX_WATCH_H #define MIPS_LINUX_WATCH_H 1 -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#endif - #include #include diff --git a/gdb/tracefile.h b/gdb/tracefile.h index 5485370..8b711a1 100644 --- a/gdb/tracefile.h +++ b/gdb/tracefile.h @@ -1,7 +1,6 @@ #ifndef TRACEFILE_H #define TRACEFILE_H 1 -#include "defs.h" #include "tracepoint.h" struct trace_file_writer;