Index: Makefile.msc
==================================================================
--- Makefile.msc
+++ Makefile.msc
@@ -40,12 +40,12 @@
 # compiling the various tools.  For the SQLite source code itself, warnings,
 # if any, will be disabled from within it.
 #
 !IFNDEF NO_WARN
 !IF $(USE_FULLWARN)!=0
-NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4152 -wd4189 -wd4206 -wd4210
-NO_WARN = $(NO_WARN) -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706
+NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206
+NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706
 !ENDIF
 !ENDIF
 
 # Set this non-0 to use the library paths and other options necessary for
 # Windows Phone 8.1.
@@ -451,14 +451,16 @@
 # The mksqlite3c.tcl script accepts some options on the command
 # line.  When compiling with debugging enabled, some of these
 # options are necessary in order to allow debugging symbols to
 # work correctly with Visual Studio when using the amalgamation.
 #
+!IFNDEF MKSQLITE3C_ARGS
 !IF $(DEBUG)>1
 MKSQLITE3C_ARGS = --linemacros
 !ELSE
 MKSQLITE3C_ARGS =
+!ENDIF
 !ENDIF
 
 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
 # Omitting the define will cause extra debugging code to be inserted and
 # includes extra comments when "EXPLAIN stmt" is used.

Index: src/msvc.h
==================================================================
--- src/msvc.h
+++ src/msvc.h
@@ -18,10 +18,11 @@
 #if defined(_MSC_VER)
 #pragma warning(disable : 4054)
 #pragma warning(disable : 4055)
 #pragma warning(disable : 4100)
 #pragma warning(disable : 4127)
+#pragma warning(disable : 4130)
 #pragma warning(disable : 4152)
 #pragma warning(disable : 4189)
 #pragma warning(disable : 4206)
 #pragma warning(disable : 4210)
 #pragma warning(disable : 4232)