Mercurial Patch Queue for Windows System Libraries
Rev. | e77cb33f187d5ad50a65a3d89ee9485d926347bc |
---|---|
大小 | 1,280 字节 |
时间 | 2019-04-02 03:25:55 |
作者 | Keith Marshall |
Log Message | Handle w32api directory rename for 6.0-exp bookmark. |
# HG changeset patch
# Parent 34fe591be1cc3ade72be436572cac60f0fe56297
diff --git a/wslapi/include/aviriff.h b/wslapi/include/aviriff.h
--- a/wslapi/include/aviriff.h
+++ b/wslapi/include/aviriff.h
@@ -2,16 +2,12 @@
#define _AVIRIFF_H
#if __GNUC__ >=3
#pragma GCC system_header
#endif
-#ifndef _MMSYSTEM_H
+#include <wingdi.h>
#include <mmsystem.h>
-#endif
-#ifndef _WINGDI_H
-#include <wingdi.h>
-#endif
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/wslapi/include/powrprof.h b/wslapi/include/powrprof.h
--- a/wslapi/include/powrprof.h
+++ b/wslapi/include/powrprof.h
@@ -2,10 +2,12 @@
#define _POWRPROF_H
#if __GNUC__ >= 3
#pragma GCC system_header
#endif
+#include <windef.h>
+
#ifdef __cplusplus
extern "C" {
#endif
#define EnableMultiBatteryDisplay 2
diff --git a/wslapi/include/wtypes.h b/wslapi/include/wtypes.h
--- a/wslapi/include/wtypes.h
+++ b/wslapi/include/wtypes.h
@@ -1,13 +1,13 @@
+#ifndef _WTYPES_H
+#pragma GCC system_header
+
#include <rpc.h>
#include <rpcndr.h>
#ifndef _WTYPES_H
#define _WTYPES_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
#ifdef __cplusplus
extern "C" {
#endif
@@ -167,5 +167,6 @@ typedef DECIMAL *LPDECIMAL;
typedef void *HMETAFILEPICT;
#ifdef __cplusplus
}
#endif
#endif
+#endif