aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPrimiano Tucci <primiano@chromium.org>2016-06-06 14:35:51 +0100
committerPrimiano Tucci <primiano@chromium.org>2016-06-06 14:35:51 +0100
commit7933830cb768faeb4c46a70f89d258492c84108b (patch)
tree251fdd1555bd9bc153e6000969c7d6096fc1f7c0 /src
parentAdding support for overlapping ranges to RangeMap. (diff)
downloadbreakpad-7933830cb768faeb4c46a70f89d258492c84108b.tar.xz
[Android] Revert x86 workaround changes for NDK r11c.
BUG=599327 R=primiano@chromium.org TBR=mark@chromium.org Review URL: https://codereview.chromium.org/2035343002 .
Diffstat (limited to 'src')
-rw-r--r--src/common/android/include/sys/user.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/common/android/include/sys/user.h b/src/common/android/include/sys/user.h
index 71b3c09a..a8b5e186 100644
--- a/src/common/android/include/sys/user.h
+++ b/src/common/android/include/sys/user.h
@@ -33,6 +33,7 @@
// The purpose of this file is to glue the mismatching headers (Android NDK vs
// glibc) and therefore avoid doing otherwise awkward #ifdefs in the code.
// The following quirks are currently handled by this file:
+// - i386: Use the Android NDK but alias user_fxsr_struct > user_fpxregs_struct.
// - aarch64: Add missing <stdint.h> include.
// - Other platforms: Just use the Android NDK unchanged.
@@ -45,4 +46,14 @@
#include_next <sys/user.h>
+#ifdef __i386__
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+typedef struct user_fxsr_struct user_fpxregs_struct;
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+#endif // __i386__
+
#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H