mingw-wsl-patches

Fork

Make <winspool.h> header effectively self-contained.

diff --git a/wslapi/include/winspool.h b/wslapi/include/winspool.h
--- a/wslapi/include/winspool.h
+++ b/wslapi/include/winspool.h
@@ -1,14 +1,14 @@
 #ifndef _WINSPOOL_H
 #define _WINSPOOL_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <winbase.h>
+#include <wingdi.h>
+
+_BEGIN_C_DECLS
+
 #define DI_CHANNEL 1
 #define DI_CHANNEL_WRITE 2
 #define DI_READ_SPOOL_JOB 3
 #define	DI_MEMORYMAP_WRITE	0x1
 #define	FORM_USER	0x0
@@ -974,9 +974,9 @@ typedef PROVIDOR_INFO_2A PROVIDOR_INFO_2
 #define SetPrinter SetPrinterA
 #define SetPrinterData SetPrinterDataA
 #define StartDocPrinter StartDocPrinterA
 #endif
 #endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
+
+_END_C_DECLS
+
 #endif
-#endif