commit 6ea01141a8840cdff0ccc6a96e75ea2de082a3f5
author Shih-wei Liao <sliao@google.com> Sun Jun 03 14:26:08 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun Jun 03 14:28:59 2012 -0700
tree e244c88bf511c1f1a684f8a138b4d928ed5f7b63
parent dac5eb2dddf852818569bfc7ef2224146878c347

GCC 4.6 (in dalvik-dev) is stricter about converting from NULL.

Fix the LLVM build for dalvik-dev.

Change-Id: I35636b971453c2977b39ff840c2960c63ad658d6

src/compiler_llvm/stub_compiler.cc

diff --git a/src/compiler_llvm/stub_compiler.cc b/src/compiler_llvm/stub_compiler.cc
index 2cf5141..a94a5ad 100644
--- a/src/compiler_llvm/stub_compiler.cc
+++ b/src/compiler_llvm/stub_compiler.cc
@@ -196,7 +196,7 @@
                                        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));