diff options
| author | David 'Digit' Turner <digit@google.com> | 2012-07-11 10:52:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-11 10:52:18 -0700 |
| commit | cca3c6afa2152260d795e4d8802080b67c96c7ea (patch) | |
| tree | 3cd5590ba241fb23b73a67bda3d6e3b51dfbb03c | |
| parent | 4f8af207ba6cb1985dc9ad3e7600c7d2b4b7ecf4 (diff) | |
| parent | 0abec4daa38319f371ac6555e7887f6b14f34291 (diff) | |
| download | external_chromium-cca3c6afa2152260d795e4d8802080b67c96c7ea.zip external_chromium-cca3c6afa2152260d795e4d8802080b67c96c7ea.tar.gz external_chromium-cca3c6afa2152260d795e4d8802080b67c96c7ea.tar.bz2 | |
am 0abec4da: Merge "Forward-compatible fix for ucontext_t"
* commit '0abec4daa38319f371ac6555e7887f6b14f34291':
Forward-compatible fix for ucontext_t
| -rw-r--r-- | base/process_util_posix.cc | 4 |
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 |