Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(334)
Issues Repositories Search
Open Issues | Closed Issues | All Issues | Sign in with your Google Account to create issues and add comments

Unified Diff: src/client/linux/android_link.h

Issue 363001: Changes to get the breakpad client compiling and running on Android using Base URL: http://google-breakpad.googlecode.com/svn/trunk/
Patch Set: Created 13 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Makefile.in ('k') | src/client/linux/handler/exception_handler.cc » ('j') | src/client/linux/minidump_writer/minidump_writer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/client/linux/android_link.h
===================================================================
--- src/client/linux/android_link.h (revision 929)
+++ src/client/linux/android_link.h (working copy)
@@ -33,7 +33,11 @@
#ifndef GOOGLE_BREAKPAD_CLIENT_LINUX_ANDROID_LINK_H_
#define GOOGLE_BREAKPAD_CLIENT_LINUX_ANDROID_LINK_H_
-#include <sys/exec_elf.h>
+// TODO(zhenghao): exec_elf.h conflicts with linux/elf.h.
+// But we still need ELFSIZE.
+//#include <sys/exec_elf.h>
+#include <machine/exec.h>
+#define ELFSIZE ARCH_ELFSIZE
#ifndef ElfW
#define ElfW(type) _ElfW (Elf, ELFSIZE, type)
« no previous file with comments | « Makefile.in ('k') | src/client/linux/handler/exception_handler.cc » ('j') | src/client/linux/minidump_writer/minidump_writer.cc » ('J')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1004:630ec63f810e-tainted