diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-31 11:05:36 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-05-31 11:06:05 -0700 |
| commit | 8c1c037ed8928fdc3898cfb224291c2f16413dcf (patch) | |
| tree | e03311c33b6ff887768ccae448a523596c934dc4 /android | |
| parent | eae0084084f68c82733e5d9d4dea8e14eba66cc9 (diff) | |
| parent | bd61185cb9da2edfd394e469f2db9291cbfaf238 (diff) | |
| download | external_chromium-8c1c037ed8928fdc3898cfb224291c2f16413dcf.zip external_chromium-8c1c037ed8928fdc3898cfb224291c2f16413dcf.tar.gz external_chromium-8c1c037ed8928fdc3898cfb224291c2f16413dcf.tar.bz2 | |
Merge bd61185cb9da2edfd394e469f2db9291cbfaf238
Change-Id: Iba8f33b2c2dc3c77a2872c9eb2297757167c8cb7
Diffstat (limited to 'android')
| -rw-r--r-- | android/prefix.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/prefix.h b/android/prefix.h index ee0122d..7381620 100644 --- a/android/prefix.h +++ b/android/prefix.h @@ -28,6 +28,8 @@ // C++ specific changes #ifdef __cplusplus +#include <unistd.h> +#include <sys/prctl.h> // chromium refers to stl functions without std:: #include <algorithm> using std::find; @@ -36,7 +38,7 @@ using std::search; // Called by command_line.cc to shorten the process name. Not needed for // network stack. -inline int prctl(int option, ...) { return 0; } +#define prctl() (0) namespace std { // our new does not trigger oom |