OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid using 'private' C++ keyword as symbol 

gdb/ChangeLog:
2015-05-15  Pedro Alves  <palves@redhat.com>

	* linux-tdep.c (linux_find_memory_regions_full): Rename local
	'private' to 'priv'.
This commit is contained in:
Pedro Alves 2015-05-15 16:00:41 +01:00
parent 2465e12e99
commit 52e48b3661
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2015-05-15 Pedro Alves <palves@redhat.com>
* linux-tdep.c (linux_find_memory_regions_full): Rename local
'private' to 'priv'.
2015-05-15 Pedro Alves <palves@redhat.com> 2015-05-15 Pedro Alves <palves@redhat.com>
* nat/linux-nat.h: Include "target/waitstatus.h". * nat/linux-nat.h: Include "target/waitstatus.h".

6
gdb/linux-tdep.c
View File

@ -1163,7 +1163,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch,
const char *permissions, *device, *filename; const char *permissions, *device, *filename;
struct smaps_vmflags v; struct smaps_vmflags v;
size_t permissions_len, device_len; size_t permissions_len, device_len;
int read, write, exec, private; int read, write, exec, priv;
int has_anonymous = 0; int has_anonymous = 0;
int should_dump_p = 0; int should_dump_p = 0;
int mapping_anon_p; 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 not have the VmFlags there. In this case, there is
really no way to know if we are dealing with VM_SHARED, really no way to know if we are dealing with VM_SHARED,
so we just assume that VM_MAYSHARE is enough. */ 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 /* Try to detect if region should be dumped by parsing smaps
counters. */ counters. */
@ -1257,7 +1257,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch,
} }
if (has_anonymous) 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, mapping_anon_p, mapping_file_p,
filename); filename);
else else