diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:35:55 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:14 +0000 |
| commit | 68a6b85744e19ade18f176a89653f1924e64f39a (patch) | |
| tree | e701fcb0f64eec9a523772eb17828dcf15574468 /base | |
| parent | 78494470aa829a52d6709093dd00e7704053e806 (diff) | |
| download | external_chromium-68a6b85744e19ade18f176a89653f1924e64f39a.zip external_chromium-68a6b85744e19ade18f176a89653f1924e64f39a.tar.gz external_chromium-68a6b85744e19ade18f176a89653f1924e64f39a.tar.bz2 | |
Merge Chromium at 9.0.597.55: Fix process_util_posix.cc
There is no ucontext.h on Android but the type is not
actually used for us, so typedef to void.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=67012
Change-Id: I1e789abaac25d513c3d4c1acb5321fa1d43f2eef
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 { |