mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 14:36:13 +01:00
Merge branch 'win32-cleanup' into 'main'
Win32 cleanup: do not define STRICT See merge request GNOME/glib!4339
This commit is contained in:
commit
26d8553af5
@ -57,12 +57,9 @@
|
||||
#include <string.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
# define STRICT /* Strict typing, please */
|
||||
# define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */
|
||||
# include <windows.h>
|
||||
# undef STRICT
|
||||
#include <windows.h>
|
||||
#else
|
||||
# include <fcntl.h>
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#include "gbacktrace.h"
|
||||
|
@ -32,13 +32,8 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include "win_iconv.c"
|
||||
#endif
|
||||
|
||||
#ifdef G_PLATFORM_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#undef STRICT
|
||||
#include "win_iconv.c"
|
||||
#endif
|
||||
|
||||
#include "gconvert.h"
|
||||
|
@ -96,9 +96,8 @@
|
||||
#endif /* HAVE_PIDFD */
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#endif /* G_OS_WIN32 */
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_MACH_MACH_TIME_H
|
||||
#include <mach/mach_time.h>
|
||||
|
@ -72,7 +72,6 @@
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#include <process.h>
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
@ -46,8 +46,6 @@
|
||||
#endif
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#include <wchar.h>
|
||||
#endif
|
||||
|
@ -30,9 +30,7 @@
|
||||
|
||||
#ifdef G_PLATFORM_WIN32
|
||||
#include <stdio.h>
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#undef STRICT
|
||||
#endif
|
||||
|
||||
#include "gconvert.h"
|
||||
|
@ -41,10 +41,8 @@
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#define STRICT /* Strict typing, please */
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#undef STRICT
|
||||
#ifndef G_WITH_CYGWIN
|
||||
#include <direct.h>
|
||||
#endif
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include <io.h>
|
||||
#include <fcntl.h>
|
||||
#include <process.h>
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
|
||||
#endif
|
||||
|
@ -24,7 +24,10 @@
|
||||
# define WINVER 0x0500
|
||||
#endif
|
||||
|
||||
#define STRICT
|
||||
#ifndef STRICT
|
||||
# define STRICT
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
Loading…
Reference in New Issue
Block a user