Build fix for chromeos.

BUG= TEST=chromeos bots compile when we roll ANGLE TBR=alokp git-svn-id: https://angleproject.googlecode.com/svn/trunk@1046 736b8ea6-26fd-11df-bfd4-992fa37f6226

Build fix for chromeos.
aeba7b89 · zmo@google.com · 1f1b0d5d · aeba7b89 · aeba7b89
Commit aeba7b89 authored Apr 17, 2012 by zmo@google.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

version.h src/common/version.h +1 -1

Lexer.cpp src/compiler/preprocessor/new/Lexer.cpp +2 -2

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1045
+#define BUILD_REVISION 1046

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/compiler/preprocessor/new/Lexer.cpp
+++ b/src/compiler/preprocessor/new/Lexer.cpp
@@ -24,8 +24,8 @@ Lexer::~Lexer()

 bool Lexer::init(int count, const char* const string[], const int length[])
 {
-    assert((count >=0) && (string != NULL));
-    if ((count < 0) || (string == NULL))
+    assert((count >= 0) && (string));
+    if ((count < 0) || (!string))
        return false;

    mInput.reset(new Input(count, string, length));