diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-07-26 19:35:48 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-07-26 19:35:48 +0300 |
| commit | 05a6b8c28baad097147eb06329ce3be940682aa9 (patch) | |
| tree | 09c28fe9a94587458ab279827dd076028252ad1f /gdbserver/configure.ac | |
| parent | 3abf97582679343f1708252712e9254d3e0f132c (diff) | |
| download | gdb-05a6b8c28baad097147eb06329ce3be940682aa9.zip gdb-05a6b8c28baad097147eb06329ce3be940682aa9.tar.gz gdb-05a6b8c28baad097147eb06329ce3be940682aa9.tar.bz2 | |
Don't unnecessarily redefine 'socklen_t' type in MinGW builds.
The original configure-time tests in gdb/ and gdbserver/ failed to
detect that 'socklen_t' is defined in MinGW headers because the test
program included only sys/socket.h, which is absent in MinGW system
headers. However on MS-Windows this data type is declared in another
header, ws2tcpip.h. The modified test programs try using ws2tcpip.h
if sys/socket.h is unavailable.
Thanks to Joel Brobecker who helped me regenerate the configure
scripts and the config.in files.
gdb/ChangeLog:
2020-07-26 Eli Zaretskii <eliz@gnu.org>
* configure.ac (AC_CHECK_HEADERS): Check for sys/socket.h and
ws2tcpip.h. When checking whether socklen_t type is defined, use
ws2tcpip.h if it is available and sys/socket.h isn't.
* configure: Regenerate.
* config.in: Regenerate.
gdbserver/ChangeLog:
2020-07-26 Eli Zaretskii <eliz@gnu.org>
* configure.ac (AC_CHECK_HEADERS): Add ws2tcpip.h.
When checking whether socklen_t type is defined, use ws2tcpip.h if
it is available and sys/socket.h isn't.
* configure: Regenerate.
* config.in: Regenerate.
Diffstat (limited to 'gdbserver/configure.ac')
| -rw-r--r-- | gdbserver/configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index 10f2f4c..4c7e392 100644 --- a/gdbserver/configure.ac +++ b/gdbserver/configure.ac @@ -75,7 +75,7 @@ AC_CHECK_HEADERS(termios.h sys/reg.h string.h dnl sys/procfs.h linux/elf.h dnl fcntl.h signal.h sys/file.h dnl sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl - netinet/tcp.h arpa/inet.h) + netinet/tcp.h arpa/inet.h ws2tcpip.h) AC_FUNC_FORK AC_CHECK_FUNCS(pread pwrite pread64) @@ -147,7 +147,11 @@ AC_CHECK_DECLS([perror, vasprintf, vsnprintf]) AC_CHECK_TYPES(socklen_t, [], [], [#include <sys/types.h> -#include <sys/socket.h> +#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#elif HAVE_WS2TCPIP_H +# include <ws2tcpip.h> +#endif ]) case "${target}" in |