Make angle compile on Win64

BUG=http://crbug.com/166496 BUG=http://crbug.com/167187 Landing this for Justin Schuh: https://codereview.appspot.com/7011048/ Review URL: https://codereview.appspot.com/7040045 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1639 736b8ea6-26fd-11df-bfd4-992fa37f6226

Make angle compile on Win64
c3dc55ba · apatrick@chromium.org · acd2d8a5 · c3dc55ba · c3dc55ba · c3dc55ba
Commit c3dc55ba authored Jan 02, 2013 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CONTRIBUTORS CONTRIBUTORS +1 -0

build_angle.gypi src/build_angle.gypi +4 -0

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

No files found.
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -36,6 +36,7 @@ Google Inc.
 Ben Vanik
 Adrienne Walker
 thestig@chromium.org
+ Justin Schuh
 Adobe Systems Inc.
 Alexandru Chiculita

--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -47,6 +47,10 @@
        'compiler/preprocessor/Tokenizer.cpp',
        'compiler/preprocessor/Tokenizer.h',
      ],
+      # TODO(jschuh): http://crbug.com/167187
+      'msvs_disabled_warnings': [
+        4267,
+      ],      
    },
    {
      'target_name': 'translator_common',

--- 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 1638
+#define BUILD_REVISION 1639
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)