126 lines
3.0 KiB
Diff
126 lines
3.0 KiB
Diff
From f72a0e95f8145df1322bba641322c45f796b789a Mon Sep 17 00:00:00 2001
|
|
From: LIU Hao <lh_mouse@126.com>
|
|
Date: Fri, 6 Jan 2023 23:18:15 +0800
|
|
Subject: [PATCH 01/12] Always define `WIN32_LEAN_AND_MEAN` before <windows.h>
|
|
|
|
Recently, mingw-w64 has got updated <msxml.h> from Wine which is included
|
|
indirectly by <windows.h> if `WIN32_LEAN_AND_MEAN` is not defined. The
|
|
`IXMLDOMDocument` class has a member function named `abort()`, which gets
|
|
affected by our `abort()` macro in "system.h".
|
|
|
|
`WIN32_LEAN_AND_MEAN` should, nevertheless, always be defined. This
|
|
can exclude 'APIs such as Cryptography, DDE, RPC, Shell, and Windows
|
|
Sockets' [1], and speed up compilation of these files a bit.
|
|
|
|
[1] https://learn.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers
|
|
|
|
gcc/
|
|
|
|
PR middle-end/108300
|
|
* config/xtensa/xtensa-dynconfig.c: Define `WIN32_LEAN_AND_MEAN`
|
|
before <windows.h>.
|
|
* diagnostic-color.cc: Likewise.
|
|
* plugin.cc: Likewise.
|
|
* prefix.cc: Likewise.
|
|
|
|
gcc/ada/
|
|
|
|
PR middle-end/108300
|
|
* adaint.c: Define `WIN32_LEAN_AND_MEAN` before `#include
|
|
<windows.h>`.
|
|
* cio.c: Likewise.
|
|
* ctrl_c.c: Likewise.
|
|
* expect.c: Likewise.
|
|
* gsocket.h: Likewise.
|
|
* mingw32.h: Likewise.
|
|
* mkdir.c: Likewise.
|
|
* rtfinal.c: Likewise.
|
|
* rtinit.c: Likewise.
|
|
* seh_init.c: Likewise.
|
|
* sysdep.c: Likewise.
|
|
* terminals.c: Likewise.
|
|
* tracebak.c: Likewise.
|
|
|
|
gcc/jit/
|
|
|
|
PR middle-end/108300
|
|
* jit-w32.h: Define `WIN32_LEAN_AND_MEAN` before <windows.h>.
|
|
|
|
libatomic/
|
|
|
|
PR middle-end/108300
|
|
* config/mingw/lock.c: Define `WIN32_LEAN_AND_MEAN` before
|
|
<windows.h>.
|
|
|
|
libffi/
|
|
|
|
PR middle-end/108300
|
|
* src/aarch64/ffi.c: Define `WIN32_LEAN_AND_MEAN` before
|
|
<windows.h>.
|
|
|
|
libgcc/
|
|
|
|
PR middle-end/108300
|
|
* config/i386/enable-execute-stack-mingw32.c: Define
|
|
`WIN32_LEAN_AND_MEAN` before <windows.h>.
|
|
* libgcc2.c: Likewise.
|
|
* unwind-generic.h: Likewise.
|
|
|
|
libgfortran/
|
|
|
|
PR middle-end/108300
|
|
* intrinsics/sleep.c: Define `WIN32_LEAN_AND_MEAN` before
|
|
<windows.h>.
|
|
|
|
libgomp/
|
|
|
|
PR middle-end/108300
|
|
* config/mingw32/proc.c: Define `WIN32_LEAN_AND_MEAN` before
|
|
<windows.h>.
|
|
|
|
libiberty/
|
|
|
|
PR middle-end/108300
|
|
* make-temp-file.c: Define `WIN32_LEAN_AND_MEAN` before <windows.h>.
|
|
* pex-win32.c: Likewise.
|
|
|
|
libssp/
|
|
|
|
PR middle-end/108300
|
|
* ssp.c: Define `WIN32_LEAN_AND_MEAN` before <windows.h>.
|
|
|
|
libstdc++-v3/
|
|
|
|
PR middle-end/108300
|
|
* src/c++11/system_error.cc: Define `WIN32_LEAN_AND_MEAN` before
|
|
<windows.h>.
|
|
* src/c++11/thread.cc: Likewise.
|
|
* src/c++17/fs_ops.cc: Likewise.
|
|
* src/filesystem/ops.cc: Likewise.
|
|
|
|
libvtv/
|
|
|
|
PR middle-end/108300
|
|
* vtv_malloc.cc: Define `WIN32_LEAN_AND_MEAN` before <windows.h>.
|
|
* vtv_rts.cc: Likewise.
|
|
* vtv_utils.cc: Likewise.
|
|
---
|
|
libgo/misc/cgo/test/callback_c.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/libgo/misc/cgo/test/callback_c.c b/libgo/misc/cgo/test/callback_c.c
|
|
index 8921b7306c6..ee9397cb496 100644
|
|
--- a/libgo/misc/cgo/test/callback_c.c
|
|
+++ b/libgo/misc/cgo/test/callback_c.c
|
|
@@ -32,6 +32,7 @@ IntoC(void)
|
|
}
|
|
|
|
#ifdef WIN32
|
|
+#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
long long
|
|
mysleep(int seconds) {
|
|
--
|
|
2.45.1
|
|
|