9 files changed, 44 insertions, 3 deletions
diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript
index 6f56caf45db..20287a61673 100644
--- a/src/third_party/IntelRDFPMathLib20U1/SConscript
+++ b/src/third_party/IntelRDFPMathLib20U1/SConscript
@@ -332,8 +332,13 @@ env.Append(CPPDEFINES=cpp_defines)
 if env.TargetOSIs('windows'):
     extra_defines = ['WINDOWS', 'WNT', 'winnt']
     env.Append(CPPDEFINES=extra_defines)
+    # C4273: '...': inconsistent dll linkage
+    env.Append(CCFLAGS=['/wd4273'])
+    # C4477: incorrect scanf format string
+    env.Append(CCFLAGS=['/wd4477'])
 
-for to_remove in ['-Werror', '-Wall', '-W']:
+
+for to_remove in ['-Werror', '-Wall', '-W', '/W3']:
     removeIfPresent(env['CCFLAGS'], to_remove)
 
 env.Library(
diff --git a/src/third_party/icu4c-57.1/source/SConscript b/src/third_party/icu4c-57.1/source/SConscript
index 203254f72a7..f0b54421fe2 100644
--- a/src/third_party/icu4c-57.1/source/SConscript
+++ b/src/third_party/icu4c-57.1/source/SConscript
@@ -44,6 +44,10 @@ for to_remove in ['-Werror', '-Wall', '-W']:
 if env.ToolchainIs('clang', 'GCC'):
     env.Append(CCFLAGS=['-Wno-sign-compare'])
 
+if env.TargetOSIs('windows'):
+    # C4996: '...': was declared deprecated
+    env.Append(CCFLAGS=['/wd4996'])
+
 i18nEnv = env.Clone()
 i18nEnv.Append(
     CPPDEFINES=[
diff --git a/src/third_party/mozjs-45/SConscript b/src/third_party/mozjs-45/SConscript
index 4e9a8b07f9c..804917f2a33 100644
--- a/src/third_party/mozjs-45/SConscript
+++ b/src/third_party/mozjs-45/SConscript
@@ -14,7 +14,7 @@ def removeIfPresent(lst, item):
     except ValueError:
         pass
 
-for to_remove in ['-Werror', '-Wall', '-W']:
+for to_remove in ['-Werror', '-Wall', '-W', '/W3']:
     removeIfPresent(env['CCFLAGS'], to_remove)
 
 # See what -D's show up in make.  The AB_CD one might change, but we're little
@@ -55,7 +55,13 @@ if env.TargetOSIs('windows'):
 
             # 'operation' : unsafe mix of type 'type' and type 'type' in operation
             '/wd4805',
-            ])
+
+            # 'reinterpret_cast': conversion from 'type' to 'type' of greater size
+            '/wd4312',
+
+            # 'operator': unsafe use of type 'type' in operation
+            '/wd4804'
+    ])
 else:
     if env.TargetOSIs('solaris'):
         env.Prepend(CCFLAGS=[
diff --git a/src/third_party/murmurhash3/SConscript b/src/third_party/murmurhash3/SConscript
index 5c6a8b844f1..9a879856f84 100644
--- a/src/third_party/murmurhash3/SConscript
+++ b/src/third_party/murmurhash3/SConscript
@@ -4,5 +4,9 @@ env = env.Clone()
 
 env.InjectThirdPartyIncludePaths(libraries=['boost'])
 
+if env.TargetOSIs('windows'):
+    # C4141: 'inline': used more than once
+    env.Append(CCFLAGS=['/wd4141'])
+
 env.Append(CPPPATH=['#src', '$BUILD_DIR'])
 env.Library("murmurhash3", ["MurmurHash3.cpp"])
diff --git a/src/third_party/s2/SConscript b/src/third_party/s2/SConscript
index 04536677d07..7da9e7e5832 100644
--- a/src/third_party/s2/SConscript
+++ b/src/third_party/s2/SConscript
@@ -25,6 +25,11 @@ env.Append(CCFLAGS=['-DDEBUG_MODE=false'])
 if env.ToolchainIs('clang'):
     env.Append(CCFLAGS=['-Wno-mismatched-tags'])
 
+if env.TargetOSIs('windows'):
+    # C4996: 'memccpy': The POSIX name for this item is deprecated. Instead, use the ISO C and C++
+    # conformant name: _memccpy. See online help for details
+    env.Append(CCFLAGS=['/wd4996'])
+
 env.Library( "s2",
     [ 
 	"s1angle.cc",
diff --git a/src/third_party/s2/util/coding/SConscript b/src/third_party/s2/util/coding/SConscript
index 85141983ad7..91ac4a791d0 100755
--- a/src/third_party/s2/util/coding/SConscript
+++ b/src/third_party/s2/util/coding/SConscript
@@ -7,6 +7,11 @@ env = env.Clone()
 env.Append(CCFLAGS=['-Isrc/third_party/s2'])
 env.Append(CCFLAGS=['-Isrc/third_party/gflags-2.0/src'])
 
+if env.TargetOSIs('windows'):
+    # C4996: 'memccpy': The POSIX name for this item is deprecated. Instead, use the ISO C and C++
+    # conformant name: _memccpy. See online help for details
+    env.Append(CCFLAGS=['/wd4996'])
+
 env.Library(
     "coding",
     [ 
diff --git a/src/third_party/s2/util/math/SConscript b/src/third_party/s2/util/math/SConscript
index f3fbbc32810..c87ad5e56ec 100755
--- a/src/third_party/s2/util/math/SConscript
+++ b/src/third_party/s2/util/math/SConscript
@@ -10,6 +10,9 @@ env.Append(CCFLAGS=['-Isrc/third_party/gflags-2.0/src'])
 if env.TargetOSIs('solaris'):
     # Enables declaration of isinf() on Solaris
     env.Append(CPPDEFINES=['__C99FEATURES__'])
+elif env.TargetOSIs('windows'):
+    # C4305: 'initializing': truncation from '...' to '...'
+    env.Append(CCFLAGS=['/wd4305'])
 
 env.Library("math",
           [ "mathutil.cc",
diff --git a/src/third_party/snappy-1.1.3/SConscript b/src/third_party/snappy-1.1.3/SConscript
index 43af2fb0136..ce0e3cd628a 100644
--- a/src/third_party/snappy-1.1.3/SConscript
+++ b/src/third_party/snappy-1.1.3/SConscript
@@ -8,6 +8,12 @@ env = env.Clone()
 if env.TargetOSIs('linux'):
     env.Append(CPPPATH=["build_linux"])
     env.Append( CPPDEFINES=[ "HAVE_CONFIG_H",  ] )
+elif env.TargetOSIs('windows'):
+    # C4996: 'memccpy': The POSIX name for this item is deprecated. Instead, use the ISO C and C++
+    # conformant name: _memccpy. See online help for details
+    env.Append(CCFLAGS=['/wd4996'])
+    # C4018: '<': signed/unsigned mismatch
+    env.Append(CCFLAGS=['/wd4018'])
 elif not env.TargetOSIs('windows'):
     env.Append(CPPPATH=["build_posix"])
     env.Append( CPPDEFINES=[ "HAVE_CONFIG_H",  ] )
diff --git a/src/third_party/timelib-2017.05beta10/SConscript b/src/third_party/timelib-2017.05beta10/SConscript
index c7c51ab862e..67830d9ccfb 100644
--- a/src/third_party/timelib-2017.05beta10/SConscript
+++ b/src/third_party/timelib-2017.05beta10/SConscript
@@ -15,6 +15,9 @@ try:
             '-DHAVE_IO_H',
             '-DHAVE_WINSOCK2_H',
         ])
+
+        # C4996: '...': was declared deprecated
+        env.Append(CCFLAGS=['/wd4996'])
     elif env.TargetOSIs('solaris'):
         env.AppendUnique(CCFLAGS=[
             '-DHAVE_DIRENT_H',