summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2012-07-11 10:22:48 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-07-11 10:22:48 -0700
commit0abec4daa38319f371ac6555e7887f6b14f34291 (patch)
treed078a41ba588ece7f429ec50eeef48e0de068eb1
parent2f413d82e2541002b7f9507ad66d341d130f80e1 (diff)
parent516fd388674362c6fb2de59340b85f3d92ea32d8 (diff)
downloadexternal_chromium-0abec4daa38319f371ac6555e7887f6b14f34291.zip
external_chromium-0abec4daa38319f371ac6555e7887f6b14f34291.tar.gz
external_chromium-0abec4daa38319f371ac6555e7887f6b14f34291.tar.bz2
Merge "Forward-compatible fix for ucontext_t"
-rw-r--r--base/process_util_posix.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 3270079..a741892 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -39,8 +39,8 @@
extern char** environ;
#endif
-#ifdef ANDROID
-// No ucontext.h on Android
+#if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T)
+// No ucontext.h on old Android C library headers
typedef void ucontext_t;
#endif