From patchwork Mon Sep 1 15:42:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2616 Received: (qmail 32367 invoked by alias); 1 Sep 2014 15:42:45 -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 32308 invoked by uid 89); 1 Sep 2014 15:42:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 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; Mon, 01 Sep 2014 15:42:39 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s81FgbPk000450 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 1 Sep 2014 11:42:37 -0400 Received: from blade.nx (ovpn-116-113.ams2.redhat.com [10.36.116.113]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s81Fga6n018758 for ; Mon, 1 Sep 2014 11:42:37 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 4BF862640E3 for ; Mon, 1 Sep 2014 16:42:36 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 2/3] Include cleanups.h in common-defs.h Date: Mon, 1 Sep 2014 16:42:33 +0100 Message-Id: <1409586154-16196-3-git-send-email-gbenson@redhat.com> In-Reply-To: <1409586154-16196-1-git-send-email-gbenson@redhat.com> References: <1409586154-16196-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit includes cleanups.h in common-defs.h and removes all other inclusions. gdb/ChangeLog: * common/common-defs.h: Include cleanups.h. * common/common-exceptions.c: Do not include cleanups.h. * utils.h: Likewise. gdb/gdbserver/ChangeLog: * server.h: Do not include cleanups.h. --- gdb/ChangeLog | 6 ++++++ gdb/common/common-defs.h | 1 + gdb/common/common-exceptions.c | 1 - gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/server.h | 1 - gdb/utils.h | 1 - 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index 2d3444b..ffcc4eb 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -45,5 +45,6 @@ #include "common-types.h" #include "print-utils.h" #include "common-debug.h" +#include "cleanups.h" #endif /* COMMON_DEFS_H */ diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c index c382d86..38216c8 100644 --- a/gdb/common/common-exceptions.c +++ b/gdb/common/common-exceptions.c @@ -19,7 +19,6 @@ #include "common-defs.h" #include "common-exceptions.h" -#include "cleanups.h" /* Possible catcher states. */ enum catcher_state { diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 812f533..b76bb1d 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -126,6 +126,5 @@ extern int handle_target_event (int err, gdb_client_data client_data); #define PBUFSIZ 16384 #include "common-exceptions.h" -#include "cleanups.h" #endif /* SERVER_H */ diff --git a/gdb/utils.h b/gdb/utils.h index c1948eb..1568011 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -21,7 +21,6 @@ #ifndef UTILS_H #define UTILS_H -#include "cleanups.h" #include "exceptions.h" extern void initialize_utils (void);