diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2019-09-14 15:34:59 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2019-09-14 15:34:59 +0300 |
| commit | 8f428a0f4722f056142170dd8cb68d3ed50f462c (patch) | |
| tree | 70d954ac529c6e4e261690e66f71d9cb8a562264 /tools | |
| parent | a044fbb21a374c960822165bff2768f3398d4a14 (diff) | |
| download | bdwgc-8f428a0f4722f056142170dd8cb68d3ed50f462c.tar.gz | |
Collapse multiple includes of windows.h
(code refactoring)
* dyn_load.c [MSWIN32 || MSWINCE || CYGWIN32]: Do not define
WIN32_LEAN_AND_MEAN and NOSERVICE macros; do not include windows.h.
* include/private/gc_locks.h [GC_WIN32_THREADS && !USE_PTHREAD_LOCKS]:
Likewise.
* include/private/gc_priv.h [!NO_CLOCK && !BSD_TIME && (MSWIN32
|| MSWINCE || WINXP_USE_PERF_COUNTER)]: Likewise.
* include/private/thread_local_alloc.h [!USE_PTHREAD_SPECIFIC
&& !USE_COMPILER_TLS && !USE_WIN32_COMPILER_TLS && USE_WIN32_SPECIFIC]:
Likewise.
* mallocx.c [MSWINCE]: Likewise.
* misc.c [MSWIN32 || MSWINCE || CYGWIN32 && GC_READ_ENV_FILE]: Likewise.
* os_dep.c [MSWIN32 || MSWINCE || CYGWIN32]: Likewise.
* tests/test.c [MSWIN32 || MSWINCE]: Likewise.
* tools/setjmp_t.c [!OS2 && (MSWIN32 || MSWINCE || CYGWIN32)]: Likewise.
* win32_threads.c [GC_WIN32_THREADS]: Likewise.
* include/private/gc_priv.h [MSWIN32 || MSWINCE || CYGWIN32]
(WIN32_LEAN_AND_MEAN, NOSERVICE): Define macro (before include
windows.h).
* include/private/gc_priv.h [MSWIN32 || MSWINCE || CYGWIN32]: Inclde
windows.h and winbase.h before include gc_locks.h (instead of just
before GC_sysinfo declaration).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/setjmp_t.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/setjmp_t.c b/tools/setjmp_t.c index 302135c6..33f10603 100644 --- a/tools/setjmp_t.c +++ b/tools/setjmp_t.c @@ -45,13 +45,8 @@ int getpagesize(void) } return((int)(result[0])); } -#elif defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN 1 -# endif -# define NOSERVICE -# include <windows.h> +#elif defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32) int getpagesize(void) { SYSTEM_INFO sysinfo; |