diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-03-02 15:13:54 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-03-02 15:13:54 +0200 |
| commit | 41fa577fbc326402be49b3f03bc828e52dba8b88 (patch) | |
| tree | a3fd0037cc7b54e522697d9694ec2a1c8a541360 | |
| parent | ca5a17b09eabb24301c8591440670613385a9026 (diff) | |
| download | gdb-41fa577fbc326402be49b3f03bc828e52dba8b88.zip gdb-41fa577fbc326402be49b3f03bc828e52dba8b88.tar.gz gdb-41fa577fbc326402be49b3f03bc828e52dba8b88.tar.bz2 | |
Fix GDB compilation on MinGW (PR gdb/24292)
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.
| -rw-r--r-- | gdb/ChangeLog | 14 | ||||
| -rw-r--r-- | gdb/common/netstuff.c | 7 | ||||
| -rw-r--r-- | gdb/gdbserver/gdbreplay.c | 7 | ||||
| -rw-r--r-- | gdb/gdbserver/remote-utils.c | 7 | ||||
| -rw-r--r-- | gdb/ser-tcp.c | 7 | ||||
| -rw-r--r-- | gdb/unittests/parse-connection-spec-selftests.c | 7 |
6 files changed, 39 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da1890a..0698c3a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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-03-01 Gary Benson <gbenson@redhat.com> * coffread.c (coff_start_symtab): Remove unnecessary xstrdup. diff --git a/gdb/common/netstuff.c b/gdb/common/netstuff.c index c1cc8d9..27fdc73 100644 --- a/gdb/common/netstuff.c +++ b/gdb/common/netstuff.c @@ -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> diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c index bda8095..63303ee 100644 --- a/gdb/gdbserver/gdbreplay.c +++ b/gdb/gdbserver/gdbreplay.c @@ -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" diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index ad0228d..4e6f9c6 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -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__ diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index f484e59..039b043 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -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 diff --git a/gdb/unittests/parse-connection-spec-selftests.c b/gdb/unittests/parse-connection-spec-selftests.c index ac7cd41..969c51e 100644 --- a/gdb/unittests/parse-connection-spec-selftests.c +++ b/gdb/unittests/parse-connection-spec-selftests.c @@ -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> |