Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Fix GDB compilation on MinGW (PR gdb/24292)

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

	PR gdb/24292
	* common/netstuff.c:
	* gdbserver/gdbreplay.c
	* gdbserver/remote-utils.c:
	* ser-tcp.c:
	* unittests/parse-connection-spec-selftests.c [USE_WIN32API]:
	Include ws2tcpip.h instead of wsiapi.h and winsock2.h.  Redefine
	_WIN32_WINNT to 0x0501 if defined to a smaller value, as
	'getaddrinfo' and 'freeaddrinfo' were not available before
	Windows XP, and mingw.org's MinGW headers by default define
	_WIN32_WINNT to 0x500.

(cherry picked from commit 41fa577fbc)
This commit is contained in:
Eli Zaretskii
2019-03-02 15:13:54 +02:00
parent 8f9cd9be4d
commit 654c8256bb
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/ChangeLog
View File

@@ -1,3 +1,17 @@
2019-03-02 Eli Zaretskii <eliz@gnu.org>
PR gdb/24292
* common/netstuff.c:
* gdbserver/gdbreplay.c
* gdbserver/remote-utils.c:
* ser-tcp.c:
* unittests/parse-connection-spec-selftests.c [USE_WIN32API]:
Include ws2tcpip.h instead of wsiapi.h and winsock2.h. Redefine
_WIN32_WINNT to 0x0501 if defined to a smaller value, as
'getaddrinfo' and 'freeaddrinfo' were not available before
Windows XP, and mingw.org's MinGW headers by default define
_WIN32_WINNT to 0x500.
2019-02-27 Kevin Buettner <kevinb@redhat.com>
* NEWS: Note minimum Python version.

7
gdb/common/netstuff.c
View File

@@ -21,8 +21,11 @@
#include <algorithm>
#ifdef USE_WIN32API
#include <winsock2.h>
#include <wspiapi.h>
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h>
#else
#include <netinet/in.h>
#include <arpa/inet.h>

7
gdb/gdbserver/gdbreplay.c
View File

@@ -45,8 +45,11 @@
#endif
#if USE_WIN32API
#include <winsock2.h>
#include <wspiapi.h>
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h>
#endif
#include "common/netstuff.h"

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

@@ -63,8 +63,11 @@
#include <sys/stat.h>
#if USE_WIN32API
#include <winsock2.h>
#include <wspiapi.h>
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h>
#endif
#if __QNX__

7
gdb/ser-tcp.c
View File

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

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

@@ -22,8 +22,11 @@
#include "common/netstuff.h"
#include "diagnostics.h"
#ifdef USE_WIN32API
#include <winsock2.h>
#include <wspiapi.h>
#if _WIN32_WINNT < 0x0501
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
#include <ws2tcpip.h>
#else
#include <netinet/in.h>
#include <arpa/inet.h>