procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always define WIN32_LEAN_AND_MEAN before <windows.h>

Browse source 
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.
This commit is contained in:
LIU Hao 2023-01-06 23:18:15 +08:00 • committed by Jonathan Yong
parent d808db1f7b
commit 902c755930
36 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/ada/adaint.c
View file

@ -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>

1
gcc/ada/cio.c
View file

@ -67,6 +67,7 @@ extern "C" {
#endif
#ifdef RTX
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <Rtapi.h>
#endif

1
gcc/ada/ctrl_c.c
View file

@ -126,6 +126,7 @@ __gnat_uninstall_int_handler (void)
#elif defined (__MINGW32__)
#define WIN32_LEAN_AND_MEAN
#include "mingw32.h"
#include <windows.h>

1
gcc/ada/expect.c
View file

@ -71,6 +71,7 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <process.h>
#include <signal.h>

1
gcc/ada/gsocket.h
View file

@ -167,6 +167,7 @@
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#elif defined(VMS)

1
gcc/ada/mingw32.h
View file

@ -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

1
gcc/ada/mkdir.c
View file

@ -43,6 +43,7 @@
#endif
#ifdef __MINGW32__
#define WIN32_LEAN_AND_MEAN
#include "mingw32.h"
#include <windows.h>
#ifdef MAXPATHLEN

1
gcc/ada/rtfinal.c
View file

@ -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>

1
gcc/ada/rtinit.c
View file

@ -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>

1
gcc/ada/seh_init.c
View file

@ -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

2
gcc/ada/sysdep.c
View file

@ -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

1
gcc/ada/terminals.c
View file

@ -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>

2
gcc/ada/tracebak.c
View file

@ -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__)

1
gcc/config/xtensa/xtensa-dynconfig.c
View file

@ -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

1
gcc/diagnostic-color.cc
View file

@ -22,6 +22,7 @@
#include "diagnostic-url.h"
#ifdef __MINGW32__
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif

1
gcc/jit/jit-w32.h
View file

@ -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 {

1
gcc/plugin.cc
View file

@ -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

1
gcc/prefix.cc
View file

@ -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"

1
libatomic/config/mingw/lock.c
View file

@ -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"

1
libffi/src/aarch64/ffi.c
View file

@ -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>

1
libgcc/config/i386/enable-execute-stack-mingw32.c
View file

@ -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 *);

1
libgcc/libgcc2.c
View file

@ -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);

1
libgcc/unwind-generic.h
View file

@ -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

1
libgfortran/intrinsics/sleep.c
View file

@ -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))

1
libgo/misc/cgo/test/callback_c.c
View file

@ -32,6 +32,7 @@ IntoC(void)
}
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
long long
mysleep(int seconds) {

1
libgomp/config/mingw32/proc.c
View file

@ -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. */

1
libiberty/make-temp-file.c
View file

@ -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

1
libiberty/pex-win32.c
View file

@ -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

1
libssp/ssp.c
View file

@ -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$"

1
libstdc++-v3/src/c++11/system_error.cc
View file

@ -33,6 +33,7 @@
#undef __sso_string
#if defined(_WIN32) && !defined(__CYGWIN__)
#define WIN32_LEAN_AND_MEAN
#include <memory>
#include <windows.h>
#endif

4
libstdc++-v3/src/c++11/thread.cc
View file

@ -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()
{

1
libstdc++-v3/src/c++17/fs_ops.cc
View file

@ -54,6 +54,7 @@
# include <utime.h> // utime
#endif
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif

1
libstdc++-v3/src/filesystem/ops.cc
View file

@ -55,6 +55,7 @@
# include <utime.h> // utime
#endif
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif

1
libvtv/vtv_malloc.cc
View file

@ -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>

1
libvtv/vtv_rts.cc
View file

@ -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>

1
libvtv/vtv_utils.cc
View file

@ -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>