7 files changed, 70 insertions, 8 deletions
diff --git a/source/include/acevents.h b/source/include/acevents.h
index f10923421b29..c2eb7324b25c 100644
--- a/source/include/acevents.h
+++ b/source/include/acevents.h
@@ -245,7 +245,8 @@ AcpiEvMaskGpe (
 
 ACPI_STATUS
 AcpiEvAddGpeReference (
-    ACPI_GPE_EVENT_INFO     *GpeEventInfo);
+    ACPI_GPE_EVENT_INFO     *GpeEventInfo,
+    BOOLEAN                 ClearOnEnable);
 
 ACPI_STATUS
 AcpiEvRemoveGpeReference (
diff --git a/source/include/acglobal.h b/source/include/acglobal.h
index 78bc7ca0be1c..e9e3206af0d7 100644
--- a/source/include/acglobal.h
+++ b/source/include/acglobal.h
@@ -323,7 +323,6 @@ ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_VerboseLeakDump);
 ACPI_GLOBAL (ACPI_NAMESPACE_NODE,       AcpiGbl_RootNodeStruct);
 ACPI_GLOBAL (ACPI_NAMESPACE_NODE *,     AcpiGbl_RootNode);
 ACPI_GLOBAL (ACPI_NAMESPACE_NODE *,     AcpiGbl_FadtGpeDevice);
-ACPI_GLOBAL (ACPI_OPERAND_OBJECT *,     AcpiGbl_ModuleCodeList);
 
 extern const UINT8                      AcpiGbl_NsProperties [ACPI_NUM_NS_TYPES];
 extern const ACPI_PREDEFINED_NAMES      AcpiGbl_PreDefinedNames [NUM_PREDEFINED_NAMES];
diff --git a/source/include/acnamesp.h b/source/include/acnamesp.h
index eaa2f1b4e898..6d148fea83ba 100644
--- a/source/include/acnamesp.h
+++ b/source/include/acnamesp.h
@@ -419,10 +419,6 @@ ACPI_STATUS
 AcpiNsEvaluate (
     ACPI_EVALUATE_INFO      *Info);
 
-void
-AcpiNsExecModuleCodeList (
-    void);
-
 
 /*
  * nsarguments - Argument count/type checking for predefined/reserved names
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index 8778da7241b0..2893bf23b1ca 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -154,7 +154,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20190509
+#define ACPI_CA_VERSION                 0x20190703
 
 #include "acconfig.h"
 #include "actypes.h"
diff --git a/source/include/platform/acmsvc.h b/source/include/platform/acmsvc.h
index d39fed71a708..394b8095cf58 100644
--- a/source/include/platform/acmsvc.h
+++ b/source/include/platform/acmsvc.h
@@ -256,6 +256,10 @@
 #endif
 #endif
 
+/* warn C4001: use of slash-slash comments */
+/* NOTE: MSVC 2015 headers use these extensively */
+#pragma warning(disable:4001)
+
 /* warn C4100: unreferenced formal parameter */
 #pragma warning(disable:4100)
 
@@ -268,10 +272,21 @@
 /* warn C4131: uses old-style declarator (iASL compiler only) */
 #pragma warning(disable:4131)
 
+/* warn C4131: uses old-style declarator (iASL compiler only) */
+#pragma warning(disable:4459)
+
 #if _MSC_VER > 1200 /* Versions above VC++ 6 */
 #pragma warning( disable : 4295 ) /* needed for acpredef.h array */
 #endif
 
+/*
+ * MSVC 2015+
+ */
+
+ /* warn C4459: xxxx (identifier) hides global declaration */
+#pragma warning(disable:4459)
+
+
 
 /* Debug support. */
 
diff --git a/source/include/platform/acwin.h b/source/include/platform/acwin.h
index 5071f948645a..51b28ca808ae 100644
--- a/source/include/platform/acwin.h
+++ b/source/include/platform/acwin.h
@@ -152,9 +152,33 @@
 #ifndef __ACWIN_H__
 #define __ACWIN_H__
 
+#include <io.h>
+
 #define ACPI_USE_STANDARD_HEADERS
 #define ACPI_USE_SYSTEM_CLIBRARY
 
+ /* Note: do not include any C library headers here */
+
+ /*
+ * Note: MSVC project files should define ACPI_DEBUGGER and ACPI_DISASSEMBLER
+ * as appropriate to enable editor functions like "Find all references".
+ * The editor isn't smart enough to dig through the include files to find
+ * out if these are actually defined.
+ */
+
+ /* Eliminate warnings for "old" (non-secure) versions of clib functions */
+
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+/* Eliminate warnings for POSIX clib function names (open, write, etc.) */
+
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+
+
 #define ACPI_MACHINE_WIDTH      32
 #define ACPI_USE_NATIVE_DIVIDE
 #define ACPI_USE_NATIVE_MATH64
@@ -183,7 +207,9 @@ typedef COMPILER_DEPENDENT_UINT64       u64;
 #define stat            _stat
 #define fstat           _fstat
 #define mkdir           _mkdir
-#define snprintf        _snprintf
+#define fileno          _fileno
+#define isatty          _isatty
+
 #if _MSC_VER <= 1200 /* Versions below VC++ 6 */
 #define vsnprintf       _vsnprintf
 #endif
@@ -195,6 +221,9 @@ typedef COMPILER_DEPENDENT_UINT64       u64;
 #define S_IREAD         _S_IREAD
 #define S_IWRITE        _S_IWRITE
 #define S_IFDIR         _S_IFDIR
+#if _MSC_VER < 1900
+#define snprintf        _snprintf
+#endif
 
 
 /*
diff --git a/source/include/platform/acwin64.h b/source/include/platform/acwin64.h
index beb331d0e7fd..9519c0395328 100644
--- a/source/include/platform/acwin64.h
+++ b/source/include/platform/acwin64.h
@@ -155,6 +155,28 @@
 #define ACPI_USE_STANDARD_HEADERS
 #define ACPI_USE_SYSTEM_CLIBRARY
 
+ /* Note: do not include any C library headers here */
+
+ /*
+ * Note: MSVC project files should define ACPI_DEBUGGER and ACPI_DISASSEMBLER
+ * as appropriate to enable editor functions like "Find all references".
+ * The editor isn't smart enough to dig through the include files to find
+ * out if these are actually defined.
+ */
+
+ /* Eliminate warnings for "old" (non-secure) versions of clib functions */
+
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+/* Eliminate warnings for POSIX clib function names (open, write, etc.) */
+
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+
+
 #define ACPI_MACHINE_WIDTH          64
 
 /*