Always define `WIN32_LEAN_AND_MEAN` before <windows.h>
Checks
Commit Message
This fixes bootstrap issues with current mingw-w64 headers:
```
../../gcc/gcc/system.h:791:30: error: expected identifier before string constant
791 | #define abort() fancy_abort (__FILE__, __LINE__, __FUNCTION__)
| ^~~~~~~~
```
The changes in this commit were generated by the following command, with some post-processing:
```
sed -Ei 's,^( *)#( *)include <windows\.h>,\1#\2define WIN32_LEAN_AND_MEAN\n&,' \
$(grep -Flr "<windows.h>")
```
This has been tested with C, C++, LTO, Fortran, Objective-C, Objective-C++ and JIT, on
{i868,x86_64}-w64-mingw32; but it contains changes to Ada, libgo, libgomp and libvtv, which I don't
usually build and test.
--
Best regards,
LIU Hao
From 6600e2b135bd06b2aad77e538b47a480c8deebdd 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] 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>.
libgo/
PR middle-end/108300
* misc/cgo/test/callback_c.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.
---
gcc/ada/adaint.c | 1 +
gcc/ada/cio.c | 1 +
gcc/ada/ctrl_c.c | 1 +
gcc/ada/expect.c | 1 +
gcc/ada/gsocket.h | 1 +
gcc/ada/mingw32.h | 1 +
gcc/ada/mkdir.c | 1 +
gcc/ada/rtfinal.c | 1 +
gcc/ada/rtinit.c | 1 +
gcc/ada/seh_init.c | 1 +
gcc/ada/sysdep.c | 2 ++
gcc/ada/terminals.c | 1 +
gcc/ada/tracebak.c | 2 ++
gcc/config/xtensa/xtensa-dynconfig.c | 1 +
gcc/diagnostic-color.cc | 1 +
gcc/jit/jit-w32.h | 1 +
gcc/plugin.cc | 1 +
gcc/prefix.cc | 1 +
libatomic/config/mingw/lock.c | 1 +
libffi/src/aarch64/ffi.c | 1 +
libgcc/config/i386/enable-execute-stack-mingw32.c | 1 +
libgcc/libgcc2.c | 1 +
libgcc/unwind-generic.h | 1 +
libgfortran/intrinsics/sleep.c | 1 +
libgo/misc/cgo/test/callback_c.c | 1 +
libgomp/config/mingw32/proc.c | 1 +
libiberty/make-temp-file.c | 1 +
libiberty/pex-win32.c | 1 +
libssp/ssp.c | 1 +
libstdc++-v3/src/c++11/system_error.cc | 1 +
libstdc++-v3/src/c++11/thread.cc | 4 +++-
libstdc++-v3/src/c++17/fs_ops.cc | 1 +
libstdc++-v3/src/filesystem/ops.cc | 1 +
libvtv/vtv_malloc.cc | 1 +
libvtv/vtv_rts.cc | 1 +
libvtv/vtv_utils.cc | 1 +
36 files changed, 40 insertions(+), 1 deletion(-)
Comments
On Sat, Jan 07, 2023 at 02:01:05AM +0800, LIU Hao via Gcc-patches wrote:
> libgomp/
>
> PR middle-end/108300
> * config/mingw32/proc.c: Define `WIN32_LEAN_AND_MEAN` before
> <windows.h>.
This change is ok for trunk.
Jakub
On 1/6/23 18:10, Jakub Jelinek wrote:
> On Sat, Jan 07, 2023 at 02:01:05AM +0800, LIU Hao via Gcc-patches wrote:
>> libgomp/
>>
>> PR middle-end/108300
>> * config/mingw32/proc.c: Define `WIN32_LEAN_AND_MEAN` before
>> <windows.h>.
>
> This change is ok for trunk.
>
> Jakub
>
Pushed to master branch, thanks LH.
On Sat, 2023-01-07 at 06:52 +0000, Jonathan Yong via Gcc-patches wrote:
> On 1/6/23 18:10, Jakub Jelinek wrote:
> > On Sat, Jan 07, 2023 at 02:01:05AM +0800, LIU Hao via Gcc-patches
> > wrote:
> > > libgomp/
> > >
> > > PR middle-end/108300
> > > * config/mingw32/proc.c: Define `WIN32_LEAN_AND_MEAN`
> > > before
> > > <windows.h>.
> >
> > This change is ok for trunk.
> >
> > Jakub
> >
>
> Pushed to master branch, thanks LH.
The patch touches libgo (w/o mentioning it in the ChangeLog). I guess
you need to contribute the libgo part into the upstream Go runtime or
the change will be undone when Ian merges libgo next time.
On Fri, Mar 3, 2023 at 10:47 PM Xi Ruoyao <xry111@xry111.site> wrote:
>
> On Sat, 2023-01-07 at 06:52 +0000, Jonathan Yong via Gcc-patches wrote:
> > On 1/6/23 18:10, Jakub Jelinek wrote:
> > > On Sat, Jan 07, 2023 at 02:01:05AM +0800, LIU Hao via Gcc-patches
> > > wrote:
> > > > libgomp/
> > > >
> > > > PR middle-end/108300
> > > > * config/mingw32/proc.c: Define `WIN32_LEAN_AND_MEAN`
> > > > before
> > > > <windows.h>.
> > >
> > > This change is ok for trunk.
> > >
> > > Jakub
> > >
> >
> > Pushed to master branch, thanks LH.
>
> The patch touches libgo (w/o mentioning it in the ChangeLog). I guess
> you need to contribute the libgo part into the upstream Go runtime or
> the change will be undone when Ian merges libgo next time.
Thanks, I've reverted the part of the patch that applies to libgo.
It's not worth changing upstream because gccgo doesn't support Windows
anyhow, and because that change is gone in the even-more-upstream
sources.
Ian
@@ -227,6 +227,7 @@ UINT __gnat_current_ccs_encoding;
#elif defined (_WIN32)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <accctrl.h>
#include <aclapi.h>
@@ -67,6 +67,7 @@ extern "C" {
#endif
#ifdef RTX
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <Rtapi.h>
#endif
@@ -126,6 +126,7 @@ __gnat_uninstall_int_handler (void)
#elif defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include "mingw32.h"
#include <windows.h>
@@ -71,6 +71,7 @@
#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <process.h>
#include <signal.h>
@@ -167,6 +167,7 @@
#endif
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#elif defined(VMS)
@@ -53,6 +53,7 @@
#define _X86INTRIN_H_INCLUDED
#define _EMMINTRIN_H_INCLUDED
#endif
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
/* After including this file it is possible to use the character t as prefix
@@ -43,6 +43,7 @@
#endif
#ifdef __MINGW32__
+#define WIN32_LEAN_AND_MEAN
#include "mingw32.h"
#include <windows.h>
#ifdef MAXPATHLEN
@@ -46,6 +46,7 @@ extern int __gnat_rt_init_count;
/* see initialize.c */
#if defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include "mingw32.h"
#include <windows.h>
@@ -70,6 +70,7 @@ int __gnat_rt_init_count = 0;
and finalize properly the run-time. */
#if defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include "mingw32.h"
#include <windows.h>
@@ -34,6 +34,7 @@
#if defined (_WIN32) || (defined (__CYGWIN__) && defined (__SEH__))
/* Include system headers, before system.h poisons malloc. */
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <excpt.h>
#endif
@@ -217,6 +217,7 @@ __gnat_ttyname (int filedes)
#endif /* __CYGWIN__ */
#if defined (__CYGWIN__) || defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
int __gnat_is_windows_xp (void);
@@ -589,6 +590,7 @@ getc_immediate_common (FILE *stream,
Ada programs. */
#ifdef WINNT
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
/* Provide functions to echo the values passed to WinMain (windows bindings
@@ -151,6 +151,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
#include <stdio.h>
#include <stdlib.h>
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winternl.h>
#include <io.h>
@@ -93,6 +93,7 @@ extern void (*Unlock_Task) (void);
#if defined (_WIN64) && defined (__SEH__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define IS_BAD_PTR(ptr) (IsBadCodePtr((FARPROC)ptr))
@@ -455,6 +456,7 @@ struct layout
#elif defined (__i386__) || defined (__x86_64__)
#if defined (__WIN32)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define IS_BAD_PTR(ptr) (IsBadCodePtr((FARPROC)ptr))
#elif defined (__sun__)
@@ -29,6 +29,7 @@
#if defined (HAVE_DLFCN_H)
#include <dlfcn.h>
#elif defined (_WIN32)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define ENABLE_PLUGIN
#endif
@@ -22,6 +22,7 @@
#include "diagnostic-url.h"
#ifdef __MINGW32__
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
@@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
namespace gcc {
@@ -41,6 +41,7 @@ along with GCC; see the file COPYING3. If not see
#ifndef NOMINMAX
#define NOMINMAX
#endif
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
@@ -67,6 +67,7 @@ License along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#include "prefix.h"
@@ -23,6 +23,7 @@
<http://www.gnu.org/licenses/>. */
#define UWORD __shadow_UWORD
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef UWORD
#include "libatomic_i.h"
@@ -28,6 +28,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include <ffi_common.h>
#include "internal.h"
#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
#include <windows.h> /* FlushInstructionCache */
#endif
#include <tramp.h>
@@ -22,6 +22,7 @@
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
extern void __enable_execute_stack (void *);
@@ -2273,6 +2273,7 @@ __clear_cache (void *beg __attribute__((__unused__)),
/* Jump to a trampoline, loading the static chain address. */
#if defined(WINNT) && ! defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
int getpagesize (void);
int mprotect (char *,int, int);
@@ -30,6 +30,7 @@
#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
/* Only for _GCC_specific_handler. */
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
@@ -30,6 +30,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#endif
#ifdef __MINGW32__
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef sleep
# define sleep(x) Sleep(1000*(x))
@@ -32,6 +32,7 @@ IntoC(void)
}
#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
long long
mysleep(int seconds) {
@@ -30,6 +30,7 @@
The following implementation uses win32 API routines. */
#include "libgomp.h"
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
/* Count the CPU's currently available to this process. */
@@ -37,6 +37,7 @@ Boston, MA 02110-1301, USA. */
#include <sys/file.h> /* May get R_OK, etc. on some systems. */
#endif
#if defined(_WIN32) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#if HAVE_SYS_STAT_H
@@ -20,6 +20,7 @@ Boston, MA 02110-1301, USA. */
#include "pex-common.h"
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#ifdef HAVE_STDLIB_H
@@ -55,6 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
/* Native win32 apps don't know about /dev/tty but can print directly
to the console using "CONOUT$" */
#if defined (_WIN32) && !defined (__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <wincrypt.h>
# define _PATH_TTY "CONOUT$"
@@ -33,6 +33,7 @@
#undef __sso_string
#if defined(_WIN32) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
#include <memory>
#include <windows.h>
#endif
@@ -35,6 +35,7 @@
# ifdef _GLIBCXX_HAVE_SLEEP
# include <unistd.h>
# elif defined(_GLIBCXX_USE_WIN32_SLEEP)
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# elif defined _GLIBCXX_NO_SLEEP && defined _GLIBCXX_HAS_GTHREADS
// We expect to be able to sleep for targets that support multiple threads:
@@ -63,7 +64,7 @@ static inline int get_nprocs()
}
# define _GLIBCXX_NPROCS get_nprocs()
#elif defined(_GLIBCXX_USE_GET_NPROCS_WIN32)
-#define WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
static inline int get_nprocs()
{
@@ -79,6 +80,7 @@ static inline int get_nprocs()
# include <unistd.h>
# define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
#elif defined(_WIN32)
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
static inline int get_nprocs()
{
@@ -54,6 +54,7 @@
# include <utime.h> // utime
#endif
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
@@ -55,6 +55,7 @@
# include <utime.h> // utime
#endif
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
+# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <unistd.h>
#if defined (__CYGWIN__) || defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <sys/mman.h>
@@ -121,6 +121,7 @@
#include <stdio.h>
#include <string.h>
#if defined (__CYGWIN__) || defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winternl.h>
#include <psapi.h>
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
#if defined (__CYGWIN__) || defined (__MINGW32__)
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <execinfo.h>