MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

On MS-Windows, define _WIN32_WINNT in a single common place.

Browse Source 
This changeset defines _WIN32_WINNT to at least 0x0501, the level
of Windows XP, unless defined to a higher level, in a single
place.  It then removes all the overrides of _WIN32_WINNT in
individual files as no longer needed.  Doing this also solves
compilation of windows-nat.c with mingw.org's MinGW, as that
file uses CONSOLE_FONT_INFO which needs the XP level to become
exposed in the Windows headers, while mingw.org defaults to
Windows 9X.

gdb/ChangeLog:
2019-05-03  Eli Zaretskii  <eliz@gnu.org>

	* common/common-defs.h [__MINGW32__ || __CYGWIN__]: Define
	_WIN32_WINNT to the XP level, unless already defined to a higher
	level.

	* unittests/parse-connection-spec-selftests.c:
	* ser-tcp.c:
	* common/netstuff.c [USE_WIN32API]:  Remove the _WIN32_WINNT
	override.

gdb/gdbserver/ChangeLog:
2019-05-03  Eli Zaretskii  <eliz@gnu.org>

	* remote-utils.c:
	* gdbreplay.c [USE_WIN32API]: Remove the _WIN32_WINNT override.
This commit is contained in:
Eli Zaretskii 2019-05-03 10:55:33 +03:00
parent 5f2459c233
commit 353ea2d106
8 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,5 +1,14 @@
2019-05-03 Eli Zaretskii <eliz@gnu.org> 2019-05-03 Eli Zaretskii <eliz@gnu.org>
* common/common-defs.h [__MINGW32__ || __CYGWIN__]: Define
_WIN32_WINNT to the XP level, unless already defined to a higher
level.
* unittests/parse-connection-spec-selftests.c:
* ser-tcp.c:
* common/netstuff.c [USE_WIN32API]: Remove the _WIN32_WINNT
override.
* symfile.c (find_separate_debug_file): Remove colon from the * symfile.c (find_separate_debug_file): Remove colon from the
drive spec of DOS/Windows file names of the target, so that the drive spec of DOS/Windows file names of the target, so that the
file name produced from DEBUGDIR and the target's directory will file name produced from DEBUGDIR and the target's directory will

14
gdb/common/common-defs.h
View File

@ -72,6 +72,20 @@
#define _FORTIFY_SOURCE 2 #define _FORTIFY_SOURCE 2
#endif #endif
/* We don't support Windows versions before XP, so we define
_WIN32_WINNT correspondingly to ensure the Windows API headers
expose the required symbols. */
#if defined (__MINGW32__) || defined (__CYGWIN__)
# ifdef _WIN32_WINNT
# if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
# endif
# else
# define _WIN32_WINNT 0x0501
# endif
#endif /* __MINGW32__ || __CYGWIN__ */
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
gdb/common/netstuff.c
View File

@ -21,10 +21,6 @@
#include <algorithm> #include <algorithm>
#ifdef USE_WIN32API #ifdef USE_WIN32API
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <netinet/in.h> #include <netinet/in.h>

5
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2019-05-03 Eli Zaretskii <eliz@gnu.org>
* remote-utils.c:
* gdbreplay.c [USE_WIN32API]: Remove the _WIN32_WINNT override.
2019-04-19 Tom Tromey <tom@tromey.com> 2019-04-19 Tom Tromey <tom@tromey.com>
* server.c (struct vstop_notif): Derive from notif_event. * server.c (struct vstop_notif): Derive from notif_event.

4
gdb/gdbserver/gdbreplay.c
View File

@ -45,10 +45,6 @@
#endif #endif
#if USE_WIN32API #if USE_WIN32API
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif

4
gdb/gdbserver/remote-utils.c
View File

@ -63,10 +63,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#if USE_WIN32API #if USE_WIN32API
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif

4
gdb/ser-tcp.c
View File

@ -39,10 +39,6 @@
#include "common/gdb_sys_time.h" #include "common/gdb_sys_time.h"
#ifdef USE_WIN32API #ifdef USE_WIN32API
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h> #include <ws2tcpip.h>
#ifndef ETIMEDOUT #ifndef ETIMEDOUT
#define ETIMEDOUT WSAETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT

4
gdb/unittests/parse-connection-spec-selftests.c
View File

@ -22,10 +22,6 @@
#include "common/netstuff.h" #include "common/netstuff.h"
#include "diagnostics.h" #include "diagnostics.h"
#ifdef USE_WIN32API #ifdef USE_WIN32API
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <netinet/in.h> #include <netinet/in.h>