diff options
| author | 2012-06-03 14:26:08 -0700 | |
|---|---|---|
| committer | 2012-06-03 14:28:59 -0700 | |
| commit | 6ea01141a8840cdff0ccc6a96e75ea2de082a3f5 (patch) | |
| tree | e244c88bf511c1f1a684f8a138b4d928ed5f7b63 /src/compiler_llvm/stub_compiler.cc | |
| parent | dac5eb2dddf852818569bfc7ef2224146878c347 (diff) | |
GCC 4.6 (in dalvik-dev) is stricter about converting from NULL.
Fix the LLVM build for dalvik-dev.
Change-Id: I35636b971453c2977b39ff840c2960c63ad658d6
Diffstat (limited to 'src/compiler_llvm/stub_compiler.cc')
| -rw-r--r-- | src/compiler_llvm/stub_compiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler_llvm/stub_compiler.cc b/src/compiler_llvm/stub_compiler.cc index 2cf5141d6e..a94a5ad333 100644 --- a/src/compiler_llvm/stub_compiler.cc +++ b/src/compiler_llvm/stub_compiler.cc @@ -196,7 +196,7 @@ uint16_t StubCompiler::CreateProxyStub(bool is_static, char const* shorty) { // Static method dosen't need proxy stub. if (is_static) { - return NULL; + return 0; } CHECK_NE(shorty, static_cast<char const*>(NULL)); |