commit 2e3d1b262af0839380e1d60e86d8b281943ef944
author Brian Carlstrom <bdc@google.com> Mon Jan 09 18:01:56 2012 -0800
committer Brian Carlstrom <bdc@google.com> Mon Jan 09 21:20:50 2012 -0800
tree f703c068e2a037d12dac592e1ebc6f1849ce4fbf
parent d170fc48b0895ee98ec0d6e3cf1987c8260af95d

Changes to compile with gcc 4.6

Change-Id: I55908b3b98b49373ce948fd1f12e0a5cd56ae4f7

src/dalvik_system_DexFile.cc

diff --git a/src/dalvik_system_DexFile.cc b/src/dalvik_system_DexFile.cc
index 23247cf..7fce25f 100644
--- a/src/dalvik_system_DexFile.cc
+++ b/src/dalvik_system_DexFile.cc
@@ -97,7 +97,7 @@
     if (!IsValidZipFilename(sourceName.c_str()) || !IsValidDexFilename(outputName.c_str())) {
       LOG(ERROR) << "Bad filenames extracting dex '" << outputName.c_str()
                  << "' from zip '" << sourceName.c_str() << "'";
-      return NULL;
+      return 0;
     }
     // Generate the output oat file for the source dex file
     ClassLinker* class_linker = Runtime::Current()->GetClassLinker();