diff options
| author | Oliver Urbann <oliver.urbann@tu-dortmund.de> | 2020-11-18 19:44:35 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-11-20 23:36:51 +0100 |
| commit | 0d16a49c16a868524a3e51d390b5ea106ce9b51c (patch) | |
| tree | 92b755319484903a9ad5d458342f6e6bbf34a134 /acinclude.m4 | |
| parent | c353207057b45c0e814823b5fe5eabeb4cc2d707 (diff) | |
| download | curl-0d16a49c16a868524a3e51d390b5ea106ce9b51c.tar.gz | |
curl: add compatibility for Amiga and GCC 6.5
Changes are mainly reordering and adding of includes required
to compile with a more recent version of GCC.
Closes #6220
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 380a8fffc..61ecd4fe1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1880,11 +1880,6 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ #endif #endif #ifndef HAVE_WINDOWS_H -#ifdef HAVE_PROTO_BSDSOCKET_H -#include <proto/bsdsocket.h> -struct Library *SocketBase = NULL; -#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -#endif #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #elif defined(HAVE_UNISTD_H) @@ -1893,6 +1888,11 @@ struct Library *SocketBase = NULL; #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_PROTO_BSDSOCKET_H +#include <proto/bsdsocket.h> +struct Library *SocketBase = NULL; +#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) +#endif #endif ]],[[ select(0, 0, 0, 0, 0); @@ -1945,11 +1945,6 @@ struct Library *SocketBase = NULL; #endif #endif #ifndef HAVE_WINDOWS_H -#ifdef HAVE_PROTO_BSDSOCKET_H -#include <proto/bsdsocket.h> -struct Library *SocketBase = NULL; -#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -#endif #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #elif defined(HAVE_UNISTD_H) @@ -1958,6 +1953,11 @@ struct Library *SocketBase = NULL; #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_PROTO_BSDSOCKET_H +#include <proto/bsdsocket.h> +struct Library *SocketBase = NULL; +#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) +#endif #define SELECTCALLCONV #endif #ifndef HAVE_STRUCT_TIMEVAL |