Fix the zlib build on 64-bit Windows.

BUG=angleproject:2004 Change-Id: Ifb4f19abbbb1b6724d2af5b0a5dfb005b49ae3d1 Reviewed-on: https://chromium-review.googlesource.com/483906 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Fix the zlib build on 64-bit Windows.
780612a5 · Geoff Lang · Commit Bot · 76b8f469 · 780612a5
Commit 780612a5 authored Apr 21, 2017 by Geoff Lang Committed by Commit Bot Apr 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

deqp.gypi src/tests/deqp.gypi +1 -1

No files found.
--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -1288,6 +1288,7 @@
                                '/wd4131', # old-style declarator
                                '/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
                                '/wd4245', # argument signed/unsigned mismatch
+                                '/wd4267', # size_t to 'type', possible loss of data
                                '/wd4324', # structure was padded
                                '/wd4701', # potentially uninit used
                                '/wd4996', # deprecated
@@ -1328,7 +1329,6 @@
                        '<(zlib_path)/inflate.h',
                        '<(zlib_path)/inftrees.c',
                        '<(zlib_path)/inftrees.h',
-                        '<(zlib_path)/mozzconf.h',
                        '<(zlib_path)/trees.c',
                        '<(zlib_path)/trees.h',
                        '<(zlib_path)/uncompr.c',