Mercurial Patch Queue for Windows System Libraries
修訂. | e77cb33f187d5ad50a65a3d89ee9485d926347bc |
---|---|
大小 | 750 bytes |
時間 | 2019-04-02 03:25:55 |
作者 | Keith Marshall |
Log Message | Handle w32api directory rename for 6.0-exp bookmark. |
Make <objidl.h> header effectively self-contained.
diff --git a/wslapi/include/objidl.h b/wslapi/include/objidl.h
--- a/wslapi/include/objidl.h
+++ b/wslapi/include/objidl.h
@@ -1,11 +1,13 @@
#ifndef _OBJIDL_H
+#pragma GCC system_header
+
+#ifndef _UNKNWN_H
+#include <unknwn.h>
+
+#else
#define _OBJIDL_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
#include <objfwd.h>
#define PIDSI_TITLE 0x00000002
#define PIDSI_SUBJECT 0x00000003
#define PIDSI_AUTHOR 0x00000004
@@ -1767,5 +1769,6 @@ HRESULT STDMETHODCALLTYPE ILockBytes_Wri
#define IClassActivator_Release(T) (T)->lpVtbl->Release(T)
#define IClassActivator_GetClassObject(T,a,b,c,d,e) (T)->lpVtbl->GetClassObject(T,a,b,c,d,e)
#endif /* COBJMACROS */
#endif
+#endif