Fix ANGLE patching/building issues.

1) Remove an empty file: this causes patch apply failures when updating WebKit side ANGLE. 2) Fix a 64-to-32 conversion issue. 3) Append a change to Tokenizer.l that's left out in a previous CL. (cpp is already updated). Review URL: https://codereview.appspot.com/7378051 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1832 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix ANGLE patching/building issues.
43c9feb1 · zmo@google.com · 99a7f610 · 43c9feb1 · 43c9feb1 · 99a7f610
Commit 43c9feb1 authored Feb 22, 2013 by zmo@google.com
Showing with 4 additions and 5 deletions

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

osinclude.h src/compiler/osinclude.h +2 -2

ossource_nspr.cpp src/compiler/ossource_nspr.cpp +0 -0

Tokenizer.l src/compiler/preprocessor/Tokenizer.l +1 -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 1831
+#define BUILD_REVISION 1832
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/compiler/osinclude.h
+++ b/src/compiler/osinclude.h
@@ -44,8 +44,8 @@
 typedef DWORD OS_TLSIndex;
 #define OS_INVALID_TLS_INDEX (TLS_OUT_OF_INDEXES)
 #elif defined(ANGLE_OS_POSIX)
-typedef unsigned int OS_TLSIndex;
+typedef pthread_key_t OS_TLSIndex;
-#define OS_INVALID_TLS_INDEX 0xFFFFFFFF
+#define OS_INVALID_TLS_INDEX (static_cast<OS_TLSIndex>(-1))
 #endif  // ANGLE_OS_WIN
 OS_TLSIndex OS_AllocTLSIndex();

--- a/src/compiler/ossource_nspr.cpp
+++ b/src/compiler/ossource_nspr.cpp
--- a/src/compiler/preprocessor/Tokenizer.l
+++ b/src/compiler/preprocessor/Tokenizer.l
@@ -279,9 +279,8 @@ Tokenizer::~Tokenizer()
    destroyScanner();
 }
-bool Tokenizer::init(int count, const char* const string[], const int length[])
+bool Tokenizer::init(size_t count, const char* const string[], const int length[])
 {
-    if (count < 0) return false;
    if ((count > 0) && (string == 0)) return false;
    mContext.input = Input(count, string, length);