base/debug/proc_maps_linux.cc - Issue 185423006: Eliminate build warnings in base/ for Android x64

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/debug/proc_maps_linux.cc

Issue 185423006: Eliminate build warnings in base/ for Android x64 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: rebase Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/debug/proc_maps_linux.cc

===================================================================

--- base/debug/proc_maps_linux.cc (revision 257841)

+++ base/debug/proc_maps_linux.cc (working copy)

@@ -6,7 +6,7 @@

#include <fcntl.h>

-#if defined(OS_LINUX)

+#if defined(OS_LINUX) || defined(OS_ANDROID)

#include <inttypes.h>

#endif

@@ -14,9 +14,10 @@

#include "base/files/scoped_file.h"

#include "base/strings/string_split.h"

-#if defined(OS_ANDROID)

-// Bionic's inttypes.h defines PRI/SCNxPTR as an unsigned long int, which

-// is incompatible with Bionic's stdint.h defining uintptr_t as a unsigned int:

+#if defined(OS_ANDROID) && !defined(__LP64__)

+// In 32-bit mode, Bionic's inttypes.h defines PRI/SCNxPTR as an

+// unsigned long int, which is incompatible with Bionic's stdint.h

+// defining uintptr_t as an unsigned int:

// https://code.google.com/p/android/issues/detail?id=57218

#undef SCNxPTR

#define SCNxPTR "x"

« no previous file with comments | « no previous file | base/debug/stack_trace_android.cc » ('j') | no next file with comments »