diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-11 07:54:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-11 07:54:44 -0800 |
| commit | 0f1b2549ee071c4a0fc8ed7eb7e4ff9f623926df (patch) | |
| tree | d9802df45e1aaf25c007f18692b6fabef3430da0 /base | |
| parent | 4070340b4e81f5928e26331b0d599f6d79f15409 (diff) | |
| parent | 68a6b85744e19ade18f176a89653f1924e64f39a (diff) | |
| download | external_chromium-0f1b2549ee071c4a0fc8ed7eb7e4ff9f623926df.zip external_chromium-0f1b2549ee071c4a0fc8ed7eb7e4ff9f623926df.tar.gz external_chromium-0f1b2549ee071c4a0fc8ed7eb7e4ff9f623926df.tar.bz2 | |
am 68a6b857: Merge Chromium at 9.0.597.55: Fix process_util_posix.cc
* commit '68a6b85744e19ade18f176a89653f1924e64f39a':
Merge Chromium at 9.0.597.55: Fix process_util_posix.cc
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_posix.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 8a97dcd..43096c0 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -36,6 +36,11 @@ extern char** environ; #endif +#ifdef ANDROID +// No ucontext.h on Android +typedef void ucontext_t; +#endif + namespace base { namespace { |