From patchwork Fri May 15 15:17:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6744 Received: (qmail 63095 invoked by alias); 15 May 2015 15:17:15 -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 63081 invoked by uid 89); 15 May 2015 15:17:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no 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, 15 May 2015 15:17:14 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4FFHDjm003698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 15 May 2015 11:17:13 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4FFHCWF018394 for ; Fri, 15 May 2015 11:17:12 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [pushed] Avoid using 'private' C++ keyword as symbol Date: Fri, 15 May 2015 16:17:11 +0100 Message-Id: <1431703031-30871-1-git-send-email-palves@redhat.com> gdb/ChangeLog: 2015-05-15 Pedro Alves * linux-tdep.c (linux_find_memory_regions_full): Rename local 'private' to 'priv'. --- gdb/ChangeLog | 5 +++++ gdb/linux-tdep.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 63c015f..05c0b3f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2015-05-15 Pedro Alves + * linux-tdep.c (linux_find_memory_regions_full): Rename local + 'private' to 'priv'. + +2015-05-15 Pedro Alves + * nat/linux-nat.h: Include "target/waitstatus.h". 2015-05-15 Yuanhui Zhang diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 9d75b66..df42097 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1163,7 +1163,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch, const char *permissions, *device, *filename; struct smaps_vmflags v; size_t permissions_len, device_len; - int read, write, exec, private; + int read, write, exec, priv; int has_anonymous = 0; int should_dump_p = 0; int mapping_anon_p; @@ -1197,7 +1197,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch, not have the VmFlags there. In this case, there is really no way to know if we are dealing with VM_SHARED, so we just assume that VM_MAYSHARE is enough. */ - private = memchr (permissions, 'p', permissions_len) != 0; + priv = memchr (permissions, 'p', permissions_len) != 0; /* Try to detect if region should be dumped by parsing smaps counters. */ @@ -1257,7 +1257,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch, } if (has_anonymous) - should_dump_p = dump_mapping_p (filterflags, &v, private, + should_dump_p = dump_mapping_p (filterflags, &v, priv, mapping_anon_p, mapping_file_p, filename); else