← Commit list

a3585c9576

Viktor Szakats

2024-12-16

SUCCESS Duration: 74s

Subject

Makefile.mk: drop in favour of autotools and cmake (MS-DOS, AmigaOS3)

Binary

Download Binary (867 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f a3585c9576abccddbd27200058912cef900c3c0f
Previous HEAD position was 39c741b7b0 cmake: add native `pkg-config` detection for remaining Find modules
HEAD is now at a3585c9576 Makefile.mk: drop in favour of autotools and cmake (MS-DOS, AmigaOS3)

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strparse.lo
Removing lib/libcurl_la-strparse.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_soc.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:125: installing './compile'
configure.ac:429: installing './config.guess'
configure.ac:429: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: installing './missing'
docs/examples/Makefile.am: installing './depcomp'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.11.2-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports Win32 file API... no
checking whether build target supports Win32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/eventfd.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for poll... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for sendmmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for arc4random... no
checking for fseeko... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... yes
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/configurehelp.pm
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:

Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz

curl version: 8.11.2-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets

configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strparse.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC terminal.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_see.o
CC tool_cb_rea.o
CC tool_cb_soc.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_help.o
CC tool_helpers.o
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_writeout.o
CC tool_vms.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC tool_ca_embed.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

.github/labeler.yml +0 -1 .github/scripts/cmp-config.pl +0 -4 .github/workflows/non-native.yml +200 -4 CMake/CurlSymbolHiding.cmake +2 -0 CMake/CurlTests.c +4 -5 CMake/FindGSS.cmake +1 -1 CMake/OtherTests.cmake +1 -1 CMake/PickyWarnings.cmake +1 -0 CMakeLists.txt +96 -32 Makefile.dist +0 -8 acinclude.m4 +2 -0 configure.ac +58 -49 docs/INSTALL-CMAKE.md +6 -2 docs/INSTALL.md +50 -11 docs/examples/Makefile.am +1 -1 docs/examples/Makefile.mk +0 -52 docs/examples/address-scope.c +3 -3 docs/examples/multi-legacy.c +10 -1 docs/examples/sendrecv.c +8 -0 lib/Makefile.am +3 -3 lib/Makefile.mk +0 -340 lib/amigaos.c +2 -3 lib/config-amigaos.h +0 -127 lib/config-dos.h +0 -136 lib/curl_addrinfo.c +0 -8 lib/curl_config.h.cmake +6 -0 lib/curl_gethostname.c +4 -0 lib/curl_setup.h +10 -8 lib/curl_setup_once.h +1 -1 lib/doh.c +2 -10 lib/file.c +5 -0 lib/ftp.c +9 -0 lib/functypes.h +1 -0 lib/getinfo.c +2 -0 lib/hostip.c +3 -1 lib/http.c +1 -1 lib/inet_ntop.h +4 -0 lib/inet_pton.h +4 -0 lib/multi.c +7 -0 lib/netrc.c +2 -0 lib/nonblock.c +6 -6 lib/parsedate.c +3 -3 lib/select.c +1 -1 lib/tftp.c +1 -1 m4/curl-amissl.m4 +1 -0 m4/curl-confopts.m4 +12 -1 m4/curl-functions.m4 +0 -31 src/Makefile.am +1 -1 src/Makefile.mk +0 -95 src/tool_cb_rea.c +7 -0 src/tool_cb_see.c +4 -0 src/tool_doswin.c +4 -3 src/tool_doswin.h +0 -8 src/tool_findfile.c +3 -2 src/tool_getparam.c +0 -4 src/tool_help.c +0 -4 src/tool_main.c +9 -0 src/tool_operate.c +1 -1 tests/data/test517 +2 -2 tests/libtest/CMakeLists.txt +4 -3 tests/libtest/Makefile.am +1 -1 tests/libtest/Makefile.inc +4 -1 tests/libtest/lib1531.c +2 -1 tests/libtest/lib1960.c +2 -21 tests/libtest/lib530.c +13 -4 tests/libtest/lib582.c +13 -4 tests/server/mqttd.c +7 -0 tests/server/resolve.c +4 -0 tests/server/sockfilt.c +28 -0 tests/server/socksd.c +21 -0 tests/server/sws.c +64 -4 tests/server/tftpd.c +6 -7 tests/server/util.c +4 -0 tests/unit/curlcheck.h +1 -1

.github/labeler.yml+0 -1

@@ -63,7 +63,6 @@ build:
	**/CMakeLists.txt,\
	**/Makefile.am,\
	**/Makefile.inc,\
-	**/Makefile.mk,\
	*/.m4,\
	*/.mk,\
	*.m4,\

.github/scripts/cmp-config.pl+0 -4

@@ -37,11 +37,8 @@ my %remove = (
	'#define CURL_EXTERN_SYMBOL' => 1,
	'#define CURL_OS "Linux"' => 1,
	'#define CURL_OS "x86_64-pc-linux-gnu"' => 1,
-	'#define CURL_SA_FAMILY_T ADDRESS_FAMILY' => 1,
-	'#define CURL_SA_FAMILY_T sa_family_t' => 1,
	'#define GETHOSTNAME_TYPE_ARG2 int' => 1,
	'#define GETHOSTNAME_TYPE_ARG2 size_t' => 1,
-	'#define HAVE_ADDRESS_FAMILY 1' => 1,
	'#define HAVE_BROTLI 1' => 1,
	'#define HAVE_BROTLI_DECODE_H 1' => 1,
	'#define HAVE_DECL_GETPWUID_R 0' => 1,
@@ -74,7 +71,6 @@ my %remove = (
	'#define HAVE_OPENSSL_SSL_H 1' => 1,
	'#define HAVE_OPENSSL_X509_H 1' => 1,
	'#define HAVE_QUICHE_H 1' => 1,
-	'#define HAVE_SA_FAMILY_T 1' => 1,
	'#define HAVE_SETJMP_H 1' => 1,
	'#define HAVE_SSL_ECH_SET1_ECHCONFIG 1' => 1,
	'#define HAVE_SSL_SET1_ECH_CONFIG_LIST 1' => 1,

.github/workflows/non-native.yml+200 -4

@@ -37,7 +37,7 @@ permissions: {}

	jobs:
	netbsd:
-	name: 'NetBSD (cmake, openssl, clang)'
+	name: 'NetBSD (CM, openssl, clang)'
	runs-on: ubuntu-latest
	timeout-minutes: 30
	strategy:
@@ -77,7 +77,7 @@ jobs:
	echo '::endgroup::'

	openbsd:
-	name: 'OpenBSD (cmake, libressl, clang)'
+	name: 'OpenBSD (CM, libressl, clang)'
	runs-on: ubuntu-latest
	timeout-minutes: 30
	strategy:
@@ -118,7 +118,7 @@ jobs:
	echo '::endgroup::'

	freebsd:
-	name: 'FreeBSD (${{ matrix.build }}, openssl, ${{ matrix.compiler }}, ${{ matrix.arch }})'
+	name: "FreeBSD (${{ matrix.build && 'CM' \|\| 'AM' }}, openssl, ${{ matrix.compiler }}, ${{ matrix.arch }})"
	runs-on: ubuntu-latest
	timeout-minutes: 60
	strategy:
@@ -194,7 +194,7 @@ jobs:
	echo '::endgroup::'

	omnios:
-	name: 'OmniOS (autotools, openssl, gcc, amd64)'
+	name: 'OmniOS (AM, openssl, gcc, amd64)'
	runs-on: ubuntu-latest
	timeout-minutes: 30
	steps:
@@ -224,3 +224,199 @@ jobs:
	echo '::group::build examples'
	gmake -j3 examples
	echo '::endgroup::'
+
+	amiga:
+	name: "AmigaOS (${{ matrix.build == 'cmake' && 'CM' \|\| 'AM' }}, AmiSSL, gcc, m68k)"
+	runs-on: 'ubuntu-24.04'
+	timeout-minutes: 30
+	env:
+	amissl-version: 5.18
+	strategy:
+	matrix:
+	build: [autotools, cmake]
+	fail-fast: false
+	steps:
+	- name: 'install compiler'
+	if: ${{ steps.cache-compiler.outputs.cache-hit != 'true' }}
+	run: \|
+	cd "${HOME}" \|\| exit 1
+	curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 3 \
+	--location https://github.com/bebbo/amiga-gcc/releases/download/Mechen/amiga-gcc.tgz \| tar -xz
+	cd opt/appveyor \|\| exit 1
+	curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 \
+	--location https://github.com/jens-maus/amissl/releases/download/${{ env.amissl-version }}/AmiSSL-${{ env.amissl-version }}-SDK.lha --output bin.lha
+	7z x -bd -y bin.lha
+	rm -f bin.lha
+	mv "$HOME/opt/appveyor" /opt
+
+	- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+	- name: 'configure'
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake -B bld \
+	-DAMIGA=1 \
+	-DCMAKE_SYSTEM_NAME=Generic \
+	-DCMAKE_SYSTEM_PROCESSOR=m68k \
+	-DCMAKE_C_COMPILER_TARGET=m68k-unknown-amigaos \
+	-DCMAKE_C_COMPILER=/opt/appveyor/build-agent/opt/amiga/bin/m68k-amigaos-gcc \
+	-DCMAKE_C_FLAGS='-O0 -msoft-float -mcrt=clib2' \
+	-DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
+	-DCURL_WERROR=ON \
+	-DCURL_USE_LIBPSL=OFF \
+	-DAMISSL_INCLUDE_DIR=/opt/appveyor/AmiSSL/Developer/include \
+	-DAMISSL_STUBS_LIBRARY=/opt/appveyor/AmiSSL/Developer/lib/AmigaOS3/libamisslstubs.a \
+	-DAMISSL_AUTO_LIBRARY=/opt/appveyor/AmiSSL/Developer/lib/AmigaOS3/libamisslauto.a
+	else
+	autoreconf -fi
+	mkdir bld && cd bld && ../configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
+	CC=/opt/appveyor/build-agent/opt/amiga/bin/m68k-amigaos-gcc \
+	AR=/opt/appveyor/build-agent/opt/amiga/bin/m68k-amigaos-ar \
+	RANLIB=/opt/appveyor/build-agent/opt/amiga/bin/m68k-amigaos-ranlib \
+	--host=m68k-amigaos \
+	--disable-shared \
+	--without-libpsl \
+	--with-amissl \
+	LDFLAGS=-L/opt/appveyor/AmiSSL/Developer/lib/AmigaOS3 \
+	CPPFLAGS=-I/opt/appveyor/AmiSSL/Developer/include \
+	CFLAGS='-O0 -msoft-float -mcrt=clib2' \
+	LIBS='-lnet -lm -latomic'
+	fi
+
+	- name: 'configure log'
+	if: ${{ !cancelled() }}
+	run: cat bld/config.log bld/CMakeFiles/CMake*.yaml 2>/dev/null \|\| true
+
+	- name: 'curl_config.h'
+	run: \|
+	echo '::group::raw'; cat bld/lib/curl_config.h \|\| true; echo '::endgroup::'
+	grep -F '#define' bld/lib/curl_config.h \| sort \|\| true
+
+	- name: 'build'
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake --build bld --parallel 5
+	else
+	make -j5 -C bld
+	fi
+
+	- name: 'build tests'
+	if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake --build bld --parallel 5 --target testdeps
+	else
+	make -j5 -C bld -C tests
+	fi
+
+	- name: 'build examples'
+	if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake --build bld --parallel 5 --target curl-examples
+	else
+	make -j5 -C bld examples
+	fi
+
+	msdos:
+	name: "MS-DOS (${{ matrix.build == 'cmake' && 'CM' \|\| 'AM' }}, openssl, djgpp, i586)"
+	runs-on: 'ubuntu-24.04'
+	timeout-minutes: 30
+	env:
+	toolchain-version: '3.4'
+	strategy:
+	matrix:
+	build: [autotools, cmake]
+	fail-fast: false
+	steps:
+	- name: 'install packages'
+	run: sudo apt-get --quiet 2 --option Dpkg::Use-Pty=0 install libfl2 ${{ matrix.build == 'cmake' && 'ninja-build' \|\| '' }}
+
+	- name: 'cache compiler (djgpp)'
+	uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
+	id: cache-compiler
+	with:
+	path: ~/djgpp
+	key: ${{ runner.os }}-djgpp-${{ env.toolchain-version }}-amd64
+
+	- name: 'install compiler (djgpp)'
+	if: ${{ steps.cache-compiler.outputs.cache-hit != 'true' }}
+	run: \|
+	cd "${HOME}" \|\| exit 1
+	curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 3 \
+	--location 'https://github.com/andrewwutw/build-djgpp/releases/download/v${{ env.toolchain-version }}/djgpp-linux64-gcc1220.tar.bz2' \| tar -xj
+	cd djgpp \|\| exit 1
+	for f in wat3211b.zip zlb13b.zip ssl102ub.zip; do
+	curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 \
+	"https://www.delorie.com/pub/djgpp/current/v2tk/$f" --output bin.zip
+	unzip -q bin.zip
+	rm -f bin.zip
+	done
+
+	- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+	- name: 'configure'
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake -B bld -G Ninja \
+	-DCMAKE_SYSTEM_NAME=DOS \
+	-DCMAKE_SYSTEM_PROCESSOR=x86 \
+	-DCMAKE_C_COMPILER_TARGET=i586-pc-msdosdjgpp \
+	-DCMAKE_C_COMPILER=$HOME/djgpp/bin/i586-pc-msdosdjgpp-gcc \
+	-DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
+	-DCURL_WERROR=ON \
+	-DCURL_USE_LIBPSL=OFF \
+	-DOPENSSL_INCLUDE_DIR=$HOME/djgpp/include \
+	-DOPENSSL_SSL_LIBRARY=$HOME/djgpp/lib/libssl.a \
+	-DOPENSSL_CRYPTO_LIBRARY=$HOME/djgpp/lib/libcrypto.a \
+	-DZLIB_INCLUDE_DIR=$HOME/djgpp/include" \
+	-DZLIB_LIBRARY=$HOME/djgpp/lib/libz.a" \
+	-DWATT_ROOT=$HOME/djgpp/net/watt
+	else
+	autoreconf -fi
+	mkdir bld && cd bld && ../configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
+	CC=$HOME/djgpp/bin/i586-pc-msdosdjgpp-gcc \
+	AR=$HOME/djgpp/bin/i586-pc-msdosdjgpp-ar \
+	RANLIB=$HOME/djgpp/bin/i586-pc-msdosdjgpp-ranlib \
+	WATT_ROOT=$HOME/djgpp/net/watt \
+	--host=i586-pc-msdosdjgpp \
+	--with-openssl=$HOME/djgpp \
+	--with-zlib=$HOME/djgpp \
+	--without-libpsl \
+	--disable-shared
+	fi
+
+	- name: 'configure log'
+	if: ${{ !cancelled() }}
+	run: cat bld/config.log bld/CMakeFiles/CMake*.yaml 2>/dev/null \|\| true
+
+	- name: 'curl_config.h'
+	run: \|
+	echo '::group::raw'; cat bld/lib/curl_config.h \|\| true; echo '::endgroup::'
+	grep -F '#define' bld/lib/curl_config.h \| sort \|\| true
+
+	- name: 'build'
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake --build bld
+	else
+	make -j5 -C bld
+	fi
+
+	- name: 'build tests'
+	if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake --build bld --target testdeps
+	else
+	make -j5 -C bld -C tests
+	fi
+
+	- name: 'build examples'
+	if: ${{ matrix.build == 'cmake' }} # skip for autotools to save time
+	run: \|
+	if [ '${{ matrix.build }}' = 'cmake' ]; then
+	cmake --build bld --target curl-examples
+	else
+	make -j5 -C bld examples
+	fi

CMake/CurlSymbolHiding.cmake+2 -0

@@ -29,6 +29,8 @@ if(WIN32 AND (ENABLE_DEBUG OR ENABLE_CURLDEBUG))
	# e.g. curl_easy_perform_ev() or curl_dbg_*(),
	# so disable symbol hiding for debug builds and for memory tracking.
	set(CURL_HIDDEN_SYMBOLS OFF)
+	elseif(DOS OR AMIGA)
+	set(CURL_HIDDEN_SYMBOLS OFF)
	endif()

	set(CURL_HIDES_PRIVATE_SYMBOLS FALSE)

CMake/CurlTests.c+4 -5

@@ -181,9 +181,7 @@ int main(void)

	#ifdef HAVE_IOCTLSOCKET_CAMEL
	/* includes start */
-	#ifdef _WIN32
-	# include <winsock2.h>
-	#endif
+	#include <proto/bsdsocket.h>
	int main(void)
	{
	/* IoctlSocket source code */
@@ -196,8 +194,9 @@ int main(void)

	#ifdef HAVE_IOCTLSOCKET_CAMEL_FIONBIO
	/* includes start */
-	#ifdef _WIN32
-	# include <winsock2.h>
+	#include <proto/bsdsocket.h>
+	#ifdef HAVE_SYS_IOCTL_H
+	# include <sys/ioctl.h>
	#endif
	int main(void)
	{

CMake/FindGSS.cmake+1 -1

@@ -175,7 +175,7 @@ if(NOT _GSS_FOUND) # Not found by pkg-config. Let us take more traditional appr

	if(_GSS_INCLUDE_DIRS) # jay, we have found something
	cmake_push_check_state()
-	set(CMAKE_REQUIRED_INCLUDES "${_GSS_INCLUDE_DIRS}")
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${_GSS_INCLUDE_DIRS}")
	check_include_files("gssapi/gssapi_generic.h;gssapi/gssapi_krb5.h" _gss_have_mit_headers)

	if(_gss_have_mit_headers)

CMake/OtherTests.cmake+1 -1

@@ -40,7 +40,7 @@ if(NOT DEFINED HAVE_STRUCT_SOCKADDR_STORAGE)
	set(CMAKE_EXTRA_INCLUDE_FILES "")
	if(WIN32)
	set(CMAKE_EXTRA_INCLUDE_FILES "winsock2.h")
-	set(CMAKE_REQUIRED_LIBRARIES "ws2_32")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "ws2_32")
	elseif(HAVE_SYS_SOCKET_H)
	set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
	endif()

CMake/PickyWarnings.cmake+1 -0

@@ -27,6 +27,7 @@ set(_picky "")

	if(CURL_WERROR AND
	((CMAKE_COMPILER_IS_GNUCC AND
+	NOT DOS AND # Watt-32 headers use the '#include_next' GCC extension
	NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND
	NOT CMAKE_VERSION VERSION_LESS 3.23.0) OR # to avoid check_symbol_exists() conflicting with GCC -pedantic-errors
	CMAKE_C_COMPILER_ID MATCHES "Clang"))

CMakeLists.txt+96 -32

@@ -108,6 +108,12 @@ endif()
	if(MSYS)
	set(_target_flags "${_target_flags} MSYS")
	endif()
+	if(DOS)
+	set(_target_flags "${_target_flags} DOS")
+	endif()
+	if(AMIGA)
+	set(_target_flags "${_target_flags} AMIGA")
+	endif()
	if(CMAKE_COMPILER_IS_GNUCC)
	set(_target_flags "${_target_flags} GCC")
	endif()
@@ -201,11 +207,20 @@ if(WIN32)
	endif()
	# Avoid storing HAVE_WIN32_WINNT in CMake cache
	unset(HAVE_WIN32_WINNT CACHE)
+	elseif(DOS OR AMIGA)
+	set(BUILD_SHARED_LIBS OFF)
+	set(BUILD_STATIC_LIBS ON)
+	if(DOS AND CMAKE_COMPILER_IS_GNUCC)
+	set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
+	set(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
+	set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+	set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+	endif()
	endif()
	option(CURL_LTO "Enable compiler Link Time Optimizations" OFF)

	cmake_dependent_option(ENABLE_THREADED_RESOLVER "Enable threaded DNS lookup"
-	ON "NOT ENABLE_ARES"
+	ON "NOT ENABLE_ARES;NOT DOS;NOT AMIGA"
	OFF)

	include(PickyWarnings)
@@ -420,7 +435,9 @@ if(ENABLE_IPV6 AND NOT WIN32)
	check_struct_has_member("struct sockaddr_in6" "sin6_addr" "netinet/in.h" HAVE_SOCKADDR_IN6_SIN6_ADDR)
	check_struct_has_member("struct sockaddr_in6" "sin6_scope_id" "netinet/in.h" HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
	if(NOT HAVE_SOCKADDR_IN6_SIN6_ADDR)
-	message(WARNING "struct sockaddr_in6 not available, disabling IPv6 support")
+	if(NOT DOS AND NOT AMIGA)
+	message(WARNING "struct sockaddr_in6 not available, disabling IPv6 support")
+	endif()
	# Force the feature off as this name is used as guard macro...
	set(ENABLE_IPV6 OFF CACHE BOOL "Enable IPv6 support" FORCE)
	endif()
@@ -469,6 +486,9 @@ endif()
	# If we are on Haiku, make sure that the network library is brought in.
	if(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
	list(APPEND CURL_LIBS "network")
+	elseif(AMIGA)
+	list(APPEND CURL_LIBS "net" "m" "atomic")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "net" "m" "atomic")
	endif()

	# Include all the necessary files for macros
@@ -489,6 +509,8 @@ elseif(APPLE)
	set(HAVE_EVENTFD 0)
	set(HAVE_GETPASS_R 0)
	set(HAVE_SENDMMSG 0)
+	elseif(AMIGA)
+	set(HAVE_GETADDRINFO 0) # Breaks the build when detected and used.
	endif()

	if(ENABLE_THREADED_RESOLVER)
@@ -503,15 +525,34 @@ if(ENABLE_THREADED_RESOLVER)
	endif()

	# Check for all needed libraries
-	if(NOT WIN32 AND NOT APPLE)
+	if(DOS)
+	if(WATT_ROOT)
+	set(USE_WATT32 ON)
+	# FIXME upstream: must specify the full path to avoid CMake converting "watt" to "watt.lib"
+	list(APPEND CURL_LIBS "${WATT_ROOT}/lib/libwatt.a")
+	include_directories(SYSTEM "${WATT_ROOT}/inc")
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${WATT_ROOT}/inc")
+	else()
+	message(FATAL_ERROR "Set WATT_ROOT variable to the root installation of Watt-32.")
+	endif()
+	elseif(AMIGA)
+	if(AMISSL_INCLUDE_DIR AND AMISSL_STUBS_LIBRARY AND AMISSL_AUTO_LIBRARY)
+	set(USE_AMISSL ON)
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${AMISSL_INCLUDE_DIR}")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "${AMISSL_STUBS_LIBRARY}" "${AMISSL_AUTO_LIBRARY}")
+	set(OPENSSL_INCLUDE_DIR "${AMISSL_INCLUDE_DIR}")
+	set(OPENSSL_SSL_LIBRARY "${AMISSL_STUBS_LIBRARY}")
+	set(OPENSSL_CRYPTO_LIBRARY "${AMISSL_AUTO_LIBRARY}")
+	set(CURL_USE_OPENSSL ON)
+	set(CURL_CA_FALLBACK ON CACHE BOOL "")
+	endif()
+	elseif(NOT WIN32 AND NOT APPLE)
	check_library_exists("socket" "connect" "" HAVE_LIBSOCKET)
	if(HAVE_LIBSOCKET)
	set(CURL_LIBS "socket;${CURL_LIBS}")
	endif()
	endif()

-	check_function_exists("gethostname" HAVE_GETHOSTNAME)
-
	if(WIN32)
	list(APPEND CURL_LIBS "ws2_32" "bcrypt")
	endif()
@@ -637,14 +678,29 @@ if(CURL_USE_OPENSSL)
	set(_curl_ca_bundle_supported TRUE)

	cmake_push_check_state()
-	set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+	list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
	if(NOT DEFINED HAVE_BORINGSSL)
	check_symbol_exists("OPENSSL_IS_BORINGSSL" "openssl/base.h" HAVE_BORINGSSL)
	endif()
	if(NOT DEFINED HAVE_AWSLC)
	check_symbol_exists("OPENSSL_IS_AWSLC" "openssl/base.h" HAVE_AWSLC)
	endif()
+	if(NOT DEFINED HAVE_LIBRESSL)
+	check_symbol_exists("LIBRESSL_VERSION_NUMBER" "openssl/opensslv.h" HAVE_LIBRESSL)
+	endif()
	cmake_pop_check_state()
+
+	if(HAVE_BORINGSSL)
+	set(_openssl "BoringSSL")
+	elseif(HAVE_AWSLC)
+	set(_openssl "AWS-LC")
+	elseif(HAVE_LIBRESSL)
+	set(_openssl "LibreSSL")
+	elseif(USE_AMISSL)
+	set(_openssl "AmiSSL")
+	else()
+	set(_openssl "OpenSSL")
+	endif()
	endif()

	if(CURL_USE_MBEDTLS)
@@ -730,8 +786,8 @@ if(CURL_USE_GNUTLS)

	if(NOT DEFINED HAVE_GNUTLS_SRP AND NOT CURL_DISABLE_SRP)
	cmake_push_check_state()
-	set(CMAKE_REQUIRED_INCLUDES ${GNUTLS_INCLUDE_DIRS})
-	set(CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES})
+	list(APPEND CMAKE_REQUIRED_INCLUDES ${GNUTLS_INCLUDE_DIRS})
+	list(APPEND CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES})
	check_symbol_exists("gnutls_srp_verifier" "gnutls/gnutls.h" HAVE_GNUTLS_SRP)
	cmake_pop_check_state()
	endif()
@@ -804,8 +860,8 @@ endif()
	macro(curl_openssl_check_symbol_exists _symbol _files _variable _extra_libs)
	cmake_push_check_state()
	if(USE_OPENSSL)
-	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
	if(HAVE_LIBZ)
	list(APPEND CMAKE_REQUIRED_LIBRARIES "${ZLIB_LIBRARIES}")
	endif()
@@ -814,8 +870,8 @@ macro(curl_openssl_check_symbol_exists _symbol _files _variable _extra_libs)
	list(APPEND CMAKE_REQUIRED_LIBRARIES "bcrypt") # for OpenSSL/LibreSSL
	endif()
	elseif(USE_WOLFSSL)
-	set(CMAKE_REQUIRED_INCLUDES "${WOLFSSL_INCLUDE_DIRS}")
-	set(CMAKE_REQUIRED_LIBRARIES "${WOLFSSL_LIBRARIES}")
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${WOLFSSL_INCLUDE_DIRS}")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "${WOLFSSL_LIBRARIES}")
	curl_required_libpaths("${WOLFSSL_LIBRARY_DIRS}")
	if(HAVE_LIBZ)
	list(APPEND CMAKE_REQUIRED_INCLUDES "${ZLIB_INCLUDE_DIRS}") # Public wolfSSL headers require zlib headers
@@ -910,6 +966,9 @@ if(USE_NGTCP2)
	else()
	find_package(NGTCP2 REQUIRED "quictls")
	list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libngtcp2_crypto_quictls")
+	if(NOT HAVE_LIBRESSL)
+	set(_openssl "quictls")
+	endif()
	endif()
	curl_openssl_check_quic()
	elseif(USE_GNUTLS)
@@ -949,8 +1008,8 @@ if(USE_QUICHE)
	endif()
	if(NOT DEFINED HAVE_QUICHE_CONN_SET_QLOG_FD)
	cmake_push_check_state()
-	set(CMAKE_REQUIRED_INCLUDES "${QUICHE_INCLUDE_DIRS}")
-	set(CMAKE_REQUIRED_LIBRARIES "${QUICHE_LIBRARIES}")
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${QUICHE_INCLUDE_DIRS}")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "${QUICHE_LIBRARIES}")
	check_symbol_exists("quiche_conn_set_qlog_fd" "quiche.h" HAVE_QUICHE_CONN_SET_QLOG_FD)
	cmake_pop_check_state()
	endif()
@@ -1015,7 +1074,7 @@ if(NOT CURL_DISABLE_LDAP)
	# Check for LDAP
	cmake_push_check_state()
	if(USE_OPENSSL)
-	set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
+	list(APPEND CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
	endif()
	find_package(LDAP)
	if(LDAP_FOUND)
@@ -1076,7 +1135,7 @@ if(APPLE)
	option(USE_APPLE_IDN "Use Apple built-in IDN support" OFF)
	if(USE_APPLE_IDN)
	cmake_push_check_state()
-	set(CMAKE_REQUIRED_LIBRARIES "icucore")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "icucore")
	check_symbol_exists("uidna_openUTS46" "unicode/uidna.h" HAVE_APPLE_IDN)
	cmake_pop_check_state()
	if(HAVE_APPLE_IDN)
@@ -1216,8 +1275,8 @@ if(CURL_USE_GSSAPI)
	endif()

	if(NOT DEFINED HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-	set(CMAKE_REQUIRED_FLAGS ${GSS_CFLAGS})
-	set(CMAKE_REQUIRED_LIBRARIES ${GSS_LIBRARIES})
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${GSS_CFLAGS}")
+	list(APPEND CMAKE_REQUIRED_LIBRARIES ${GSS_LIBRARIES})
	curl_required_libpaths("${GSS_LIBRARY_DIRS}")
	check_symbol_exists("GSS_C_NT_HOSTBASED_SERVICE" "${_include_list}" HAVE_GSS_C_NT_HOSTBASED_SERVICE)
	endif()
@@ -1282,7 +1341,7 @@ endif()

	option(ENABLE_UNIX_SOCKETS "Enable Unix domain sockets support" ON)
	if(ENABLE_UNIX_SOCKETS)
-	if(WIN32)
+	if(WIN32 OR DOS)
	set(USE_UNIX_SOCKETS ON)
	else()
	include(CheckStructHasMember)
@@ -1430,7 +1489,7 @@ check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
	check_include_file_concat_curl("sys/time.h" HAVE_SYS_TIME_H)
	check_include_file_concat_curl("sys/types.h" HAVE_SYS_TYPES_H)
	check_include_file("sys/un.h" HAVE_SYS_UN_H)
-	check_include_file("sys/utime.h" HAVE_SYS_UTIME_H)
+	check_include_file_concat_curl("sys/utime.h" HAVE_SYS_UTIME_H) # sys/types.h (AmigaOS)
	check_include_file("sys/xattr.h" HAVE_SYS_XATTR_H)

	check_include_file_concat_curl("arpa/inet.h" HAVE_ARPA_INET_H)
@@ -1458,7 +1517,7 @@ check_include_file("termios.h" HAVE_TERMIOS_H)
	check_include_file_concat_curl("unistd.h" HAVE_UNISTD_H)
	check_include_file("utime.h" HAVE_UTIME_H)

-	if(CMAKE_SYSTEM_NAME MATCHES "AmigaOS")
+	if(AMIGA)
	check_include_file_concat_curl("proto/bsdsocket.h" HAVE_PROTO_BSDSOCKET_H)
	endif()

@@ -1504,10 +1563,14 @@ if(SIZEOF_SUSECONDS_T)
	endif()

	# Check for some functions that are used
+
+	# Apply to all feature checks
	if(WIN32)
-	list(APPEND CMAKE_REQUIRED_LIBRARIES "ws2_32") # Apply to all feature checks
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "ws2_32")
	elseif(HAVE_LIBSOCKET)
-	list(APPEND CMAKE_REQUIRED_LIBRARIES "socket") # Apply to all feature checks
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "socket")
+	elseif(DOS)
+	list(APPEND CMAKE_REQUIRED_LIBRARIES "${WATT_ROOT}/lib/libwatt.a")
	endif()

	check_function_exists("fnmatch" HAVE_FNMATCH)
@@ -1544,6 +1607,7 @@ check_function_exists("utime" HAVE_UTIME)
	check_symbol_exists("gmtime_r" "stdlib.h;time.h" HAVE_GMTIME_R)

	check_symbol_exists("gethostbyname_r" "netdb.h" HAVE_GETHOSTBYNAME_R)
+	check_symbol_exists("gethostname" "${CURL_INCLUDES}" HAVE_GETHOSTNAME) # winsock2.h unistd.h proto/bsdsocket.h

	check_symbol_exists("signal" "signal.h" HAVE_SIGNAL)
	check_symbol_exists("strtoll" "stdlib.h" HAVE_STRTOLL)
@@ -1568,7 +1632,7 @@ if(WIN32 OR CYGWIN)
	check_function_exists("_setmode" HAVE__SETMODE)
	endif()

-	if(CMAKE_SYSTEM_NAME MATCHES "AmigaOS")
+	if(AMIGA)
	check_symbol_exists("CloseSocket" "${CURL_INCLUDES}" HAVE_CLOSESOCKET_CAMEL) # sys/socket.h proto/bsdsocket.h
	endif()

@@ -1597,11 +1661,11 @@ endif()

	cmake_push_check_state()
	if(WIN32)
-	set(CMAKE_EXTRA_INCLUDE_FILES "winsock2.h")
+	list(APPEND CMAKE_EXTRA_INCLUDE_FILES "winsock2.h")
	check_type_size("ADDRESS_FAMILY" SIZEOF_ADDRESS_FAMILY)
	set(HAVE_ADDRESS_FAMILY ${HAVE_SIZEOF_ADDRESS_FAMILY})
	elseif(HAVE_SYS_SOCKET_H)
-	set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
+	list(APPEND CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
	check_type_size("sa_family_t" SIZEOF_SA_FAMILY_T)
	set(HAVE_SA_FAMILY_T ${HAVE_SIZEOF_SA_FAMILY_T})
	endif()
@@ -1635,7 +1699,7 @@ endforeach()
	cmake_push_check_state()
	if(HAVE_FILE_OFFSET_BITS)
	set(_FILE_OFFSET_BITS 64)
-	set(CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
+	list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
	endif()
	check_type_size("off_t" SIZEOF_OFF_T)

@@ -1650,10 +1714,10 @@ endif()

	# Include this header to get the type
	cmake_push_check_state()
-	set(CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/include")
-	set(CMAKE_EXTRA_INCLUDE_FILES "curl/system.h")
+	list(APPEND CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/include")
+	list(APPEND CMAKE_EXTRA_INCLUDE_FILES "curl/system.h")
	check_type_size("curl_off_t" SIZEOF_CURL_OFF_T)
-	set(CMAKE_EXTRA_INCLUDE_FILES "curl/curl.h")
+	list(APPEND CMAKE_EXTRA_INCLUDE_FILES "curl/curl.h")
	check_type_size("curl_socket_t" SIZEOF_CURL_SOCKET_T)
	cmake_pop_check_state() # pop curl system headers
	cmake_pop_check_state() # pop -D_FILE_OFFSET_BITS=64
@@ -1972,8 +2036,8 @@ message(STATUS "Features: ${SUPPORT_FEATURES}")
	# Clear list and collect SSL backends
	set(_items "")
	curl_add_if("Schannel" _ssl_enabled AND USE_SCHANNEL)
-	curl_add_if("OpenSSL" _ssl_enabled AND USE_OPENSSL AND OPENSSL_VERSION VERSION_LESS 3.0.0)
-	curl_add_if("OpenSSL v3+" _ssl_enabled AND USE_OPENSSL AND NOT OPENSSL_VERSION VERSION_LESS 3.0.0)
+	curl_add_if("${_openssl}" _ssl_enabled AND USE_OPENSSL AND OPENSSL_VERSION VERSION_LESS 3.0.0)
+	curl_add_if("${_openssl} v3+" _ssl_enabled AND USE_OPENSSL AND NOT OPENSSL_VERSION VERSION_LESS 3.0.0)
	curl_add_if("Secure Transport" _ssl_enabled AND USE_SECTRANSP)
	curl_add_if("mbedTLS" _ssl_enabled AND USE_MBEDTLS)
	curl_add_if("BearSSL" _ssl_enabled AND USE_BEARSSL)

Makefile.dist+0 -8

@@ -38,10 +38,6 @@ vc-x64:
	cd winbuild
	nmake /f Makefile.vc MACHINE=x64

-	djgpp%:
-	$(MAKE) -C lib -f Makefile.mk CFG=$@ CROSSPREFIX=i586-pc-msdosdjgpp-
-	$(MAKE) -C src -f Makefile.mk CFG=$@ CROSSPREFIX=i586-pc-msdosdjgpp-
-
	cygwin:
	./configure
	make
@@ -50,10 +46,6 @@ cygwin-ssl:
	./configure --with-openssl
	make

-	amiga%:
-	$(MAKE) -C lib -f Makefile.mk CFG=$@ CROSSPREFIX=m68k-amigaos-
-	$(MAKE) -C src -f Makefile.mk CFG=$@ CROSSPREFIX=m68k-amigaos-
-
	unix: all

	unix-ssl: ssl

acinclude.m4+2 -0

@@ -1563,6 +1563,8 @@ AC_DEFUN([CURL_PREPARE_BUILDINFO], [
	fi
	case $host_os in
	msys*) curl_pflags="${curl_pflags} MSYS";;
+	msdos*) curl_pflags="${curl_pflags} DOS";;
+	amiga*) curl_pflags="${curl_pflags} AMIGA";;
	esac
	if test "x$compiler_id" = 'xGNU_C'; then
	curl_pflags="${curl_pflags} GCC"

configure.ac+58 -49

@@ -1214,12 +1214,19 @@ fi

	if test "$HAVE_GETHOSTBYNAME" != "1"; then
	dnl gethostbyname in the watt lib?
+	clean_CPPFLAGS=$CPPFLAGS
+	clean_LDFLAGS=$LDFLAGS
+	CPPFLAGS="-I${WATT_ROOT}/inc"
+	LDFLAGS="-L${WATT_ROOT}/lib"
	AC_CHECK_LIB(watt, gethostbyname,
	[
	HAVE_GETHOSTBYNAME="1"
-	CPPFLAGS="-I${WATT_ROOT}/inc"
-	LDFLAGS="-L${WATT_ROOT}/lib"
	LIBS="-lwatt $LIBS"
+	AC_DEFINE(USE_WATT32, 1, [if Watt-32 is in use])
+	],
+	[
+	CPPFLAGS=$clean_CPPFLAGS
+	LDFLAGS=$clean_LDFLAGS
	]
	)
	fi
@@ -1784,35 +1791,35 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),
	;;
	esac ],

-	AC_RUN_IFELSE([AC_LANG_SOURCE([[
-	/* are AF_INET6 and sockaddr_in6 available? */
-	#include <sys/types.h>
-	#ifdef _WIN32
-	#include <winsock2.h>
-	#include <ws2tcpip.h>
-	#else
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#if defined (__TANDEM)
-	# include <netinet/in6.h>
-	#endif
-	#endif
-
-	int main(void)
-	{
-	struct sockaddr_in6 s;
-	(void)s;
-	return socket(AF_INET6, SOCK_STREAM, 0) < 0;
-	}
-	]])
+	AC_COMPILE_IFELSE([
+	AC_LANG_SOURCE([[
+	/* are AF_INET6 and sockaddr_in6 available? */
+	#include <sys/types.h>
+	#ifdef _WIN32
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+	#else
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#ifdef __TANDEM
+	#include <netinet/in6.h>
+	#endif
+	#endif
+
+	int main(void)
+	{
+	struct sockaddr_in6 s;
+	(void)s;
+	return socket(AF_INET6, SOCK_STREAM, 0) < 0;
+	}
+	]])
	],
-	AC_MSG_RESULT(yes)
-	ipv6=yes,
-	AC_MSG_RESULT(no)
-	ipv6=no,
-	AC_MSG_RESULT(yes)
-	ipv6=yes
-	))
+	AC_MSG_RESULT(yes)
+	ipv6=yes,
+	AC_MSG_RESULT(no)
+	ipv6=no
+	)
+	)

	if test "$ipv6" = yes; then
	curl_ipv6_msg="enabled"
@@ -1820,24 +1827,26 @@ if test "$ipv6" = yes; then
	IPV6_ENABLED=1

	AC_MSG_CHECKING([if struct sockaddr_in6 has sin6_scope_id member])
-	AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[
-	#include <sys/types.h>
-	#ifdef _WIN32
-	#include <winsock2.h>
-	#include <ws2tcpip.h>
-	#else
-	#include <netinet/in.h>
-	#if defined (__TANDEM)
-	# include <netinet/in6.h>
-	#endif
-	#endif
-	]], [[
-	struct sockaddr_in6 s;
-	s.sin6_scope_id = 0;
-	]])], [
+	AC_COMPILE_IFELSE([
+	AC_LANG_PROGRAM([[
+	#include <sys/types.h>
+	#ifdef _WIN32
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+	#else
+	#include <netinet/in.h>
+	#ifdef __TANDEM
+	#include <netinet/in6.h>
+	#endif
+	#endif
+	]], [[
+	struct sockaddr_in6 s;
+	s.sin6_scope_id = 0;
+	]])
+	],[
	AC_MSG_RESULT([yes])
	AC_DEFINE(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID, 1, [Define to 1 if struct sockaddr_in6 has the sin6_scope_id member])
-	], [
+	],[
	AC_MSG_RESULT([no])
	])
	fi
@@ -4018,12 +4027,12 @@ AC_CHECK_TYPE([bool],[

	# check for sa_family_t
	AC_CHECK_TYPE(sa_family_t,
-	AC_DEFINE(CURL_SA_FAMILY_T, sa_family_t, [IP address type in sockaddr]),
+	AC_DEFINE(HAVE_SA_FAMILY_T, 1, [Define to 1 if symbol `sa_family_t' exists]),
	[
	# The Windows name?
	AC_CHECK_TYPE(ADDRESS_FAMILY,
-	AC_DEFINE(CURL_SA_FAMILY_T, ADDRESS_FAMILY, [IP address type in sockaddr]),
-	AC_DEFINE(CURL_SA_FAMILY_T, unsigned short, [IP address type in sockaddr]),
+	AC_DEFINE(HAVE_ADDRESS_FAMILY, 1, [Define to 1 if symbol `ADDRESS_FAMILY' exists]),
+	[],
	[
	#ifdef _WIN32
	#ifndef WIN32_LEAN_AND_MEAN

docs/INSTALL-CMAKE.md+6 -2

@@ -182,8 +182,8 @@ assumes that CMake generates `Makefile`:

	- `CURL_ENABLE_SSL`: Enable SSL support. Default: `ON`
	- `CURL_WINDOWS_SSPI`: Enable SSPI on Windows. Default: =`CURL_USE_SCHANNEL`
-	- `ENABLE_IPV6`: Enable IPv6 support. Default: `ON`
-	- `ENABLE_THREADED_RESOLVER`: Enable threaded DNS lookup. Default: `ON` if c-ares is not enabled
+	- `ENABLE_IPV6`: Enable IPv6 support. Default: `ON` if target supports IPv6.
+	- `ENABLE_THREADED_RESOLVER`: Enable threaded DNS lookup. Default: `ON` if c-ares is not enabled and target supports threading.
	- `ENABLE_UNICODE`: Use the Unicode version of the Windows API functions. Default: `OFF`
	- `ENABLE_UNIX_SOCKETS`: Enable Unix domain sockets support. Default: `ON`
	- `USE_ECH`: Enable ECH support. Default: `OFF`
@@ -304,6 +304,9 @@ Details via CMake
	## Dependency options

	- `PERL_EXECUTABLE` Perl binary used throughout the build and tests.
+	- `AMISSL_INCLUDE_DIR`: The AmiSSL include directory.
+	- `AMISSL_STUBS_LIBRARY`: Path to `amisslstubs` library.
+	- `AMISSL_AUTO_LIBRARY`: Path to `amisslauto` library.
	- `BEARSSL_INCLUDE_DIR`: The BearSSL include directory.
	- `BEARSSL_LIBRARY`: Path to `bearssl` library.
	- `BROTLI_INCLUDE_DIR`: The brotli include directory.
@@ -345,6 +348,7 @@ Details via CMake
	- `QUICHE_LIBRARY`: Path to `quiche` library.
	- `RUSTLS_INCLUDE_DIR`: The Rustls include directory.
	- `RUSTLS_LIBRARY`: Path to `rustls` library.
+	- `WATT_ROOT`: Set this variable to the root installation of Watt-32.
	- `WOLFSSH_INCLUDE_DIR`: The wolfSSH include directory.
	- `WOLFSSH_LIBRARY`: Path to `wolfssh` library.
	- `WOLFSSL_INCLUDE_DIR`: The wolfSSL include directory.

docs/INSTALL.md+50 -11

@@ -211,17 +211,34 @@ Run `make`

	## MS-DOS

-	Requires DJGPP in the search path and pointing to the Watt-32 stack via
-	`WATT_PATH=c:/djgpp/net/watt`.
-
-	Run `make -f Makefile.dist djgpp` in the root curl dir.
-
-	For build configuration options, please see the mingw-w64 section.
+	You can use either autotools or cmake:
+
+	./configure \
+	CC=/path/to/djgpp/bin/i586-pc-msdosdjgpp-gcc \
+	AR=/path/to/djgpp/bin/i586-pc-msdosdjgpp-ar \
+	RANLIB=/path/to/djgpp/bin/i586-pc-msdosdjgpp-ranlib \
+	WATT_ROOT=/path/to/djgpp/net/watt \
+	--host=i586-pc-msdosdjgpp \
+	--with-openssl=/path/to/djgpp \
+	--with-zlib=/path/to/djgpp \
+	--without-libpsl \
+	--disable-shared
+
+	cmake . \
+	-DCMAKE_SYSTEM_NAME=DOS \
+	-DCMAKE_C_COMPILER_TARGET=i586-pc-msdosdjgpp \
+	-DCMAKE_C_COMPILER=/path/to/djgpp/bin/i586-pc-msdosdjgpp-gcc \
+	-DWATT_ROOT=/path/to/djgpp/net/watt \
+	-DOPENSSL_INCLUDE_DIR=/path/to/djgpp/include \
+	-DOPENSSL_SSL_LIBRARY=/path/to/djgpp/lib/libssl.a \
+	-DOPENSSL_CRYPTO_LIBRARY=/path/to/djgpp/lib/libcrypto.a \
+	-DZLIB_INCLUDE_DIR=/path/to/djgpp/include \
+	-DZLIB_LIBRARY=/path/to/djgpp/lib/libz.a \
+	-DCURL_USE_LIBPSL=OFF

	Notes:

-	- DJGPP 2.04 beta has a `sscanf()` bug so the URL parsing is not done
-	properly. Use DJGPP 2.03 until they fix it.
+	- Requires DJGPP 2.04 or upper.

	- Compile Watt-32 (and OpenSSL) with the same version of DJGPP. Otherwise
	things go wrong because things like FS-extensions and `errno` values have
@@ -229,9 +246,31 @@ Notes:

	## AmigaOS

-	Run `make -f Makefile.dist amiga` in the root curl dir.
-
-	For build configuration options, please see the mingw-w64 section.
+	You can use either autotools or cmake:
+
+	./configure \
+	CC=/opt/amiga/bin/m68k-amigaos-gcc \
+	AR=/opt/amiga/bin/m68k-amigaos-ar \
+	RANLIB=/opt/amiga/bin/m68k-amigaos-ranlib \
+	--host=m68k-amigaos \
+	--with-amissl \
+	CFLAGS='-O0 -msoft-float -mcrt=clib2' \
+	CPPFLAGS=-I/path/to/AmiSSL/Developer/include \
+	LDFLAGS=-L/path/to/AmiSSL/Developer/lib/AmigaOS3 \
+	LIBS='-lnet -lm -latomic' \
+	--without-libpsl \
+	--disable-shared
+
+	cmake . \
+	-DAMIGA=1 \
+	-DCMAKE_SYSTEM_NAME=Generic \
+	-DCMAKE_C_COMPILER_TARGET=m68k-unknown-amigaos \
+	-DCMAKE_C_COMPILER=/opt/amiga/bin/m68k-amigaos-gcc \
+	-DCMAKE_C_FLAGS='-O0 -msoft-float -mcrt=clib2' \
+	-DAMISSL_INCLUDE_DIR=/path/to/AmiSSL/Developer/include \
+	-DAMISSL_STUBS_LIBRARY=/path/to/AmiSSL/Developer/lib/AmigaOS3/libamisslstubs.a \
+	-DAMISSL_AUTO_LIBRARY=/path/to/AmiSSL/Developer/lib/AmigaOS3/libamisslauto.a \
+	-DCURL_USE_LIBPSL=OFF

	## Disabling Specific Protocols in Windows builds

docs/examples/Makefile.am+1 -1

@@ -24,7 +24,7 @@

	AUTOMAKE_OPTIONS = foreign nostdinc

-	EXTRA_DIST = README.md Makefile.example Makefile.mk CMakeLists.txt \
+	EXTRA_DIST = README.md Makefile.example CMakeLists.txt \
	$(COMPLICATED_EXAMPLES) .checksrc

	# Specify our include paths here, and do it relative to $(top_srcdir) and

docs/examples/Makefile.mk+0 -52

@@ -1,52 +0,0 @@
-	#***************************************************************************
-	# _ _ ____ _
-	# Project ___\| \| \| \| _ \\| \|
-	# / __\| \| \| \| \|_) \| \|
-	# \| (__\| \|_\| \| _ <\| \|___
-	# \___\|\___/\|_\| \_\_____\|
-	#
-	# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
-	#
-	# This software is licensed as described in the file COPYING, which
-	# you should have received as part of this distribution. The terms
-	# are also available at https://curl.se/docs/copyright.html.
-	#
-	# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-	# copies of the Software, and permit persons to whom the Software is
-	# furnished to do so, under the terms of the COPYING file.
-	#
-	# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-	# KIND, either express or implied.
-	#
-	# SPDX-License-Identifier: curl
-	#
-	#***************************************************************************
-
-	# Build libcurl via lib/Makefile.mk first.
-
-	PROOT := ../..
-
-	### Common
-
-	include $(PROOT)/lib/Makefile.mk
-
-	### Local
-
-	CPPFLAGS += -DCURL_NO_OLDIES
-	LDFLAGS += -L$(PROOT)/lib
-	LIBS := -lcurl $(LIBS)
-
-	### Sources and targets
-
-	# Provides check_PROGRAMS
-	include Makefile.inc
-
-	TARGETS := $(patsubst %,%$(BIN_EXT),$(strip $(check_PROGRAMS)))
-	TOCLEAN := $(TARGETS)
-
-	### Rules
-
-	%$(BIN_EXT): %.c $(PROOT)/lib/libcurl.a
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LIBS)
-
-	all: $(TARGETS)

docs/examples/address-scope.c+3 -3

@@ -28,14 +28,14 @@
	#include <stdio.h>
	#include <curl/curl.h>

-	#ifndef _WIN32
+	#if !defined(_WIN32) && !defined(MSDOS) && !defined(__AMIGA__)
	#include <net/if.h>
	#endif

	int main(void)
	{
-	#ifndef _WIN32
-	/* Windows users need to find how to use if_nametoindex() */
+	#if !defined(_WIN32) && !defined(MSDOS) && !defined(__AMIGA__)
+	/* Windows/MS-DOS users need to find how to use if_nametoindex() */
	CURL *curl;
	CURLcode res;

docs/examples/multi-legacy.c+10 -1

@@ -100,11 +100,19 @@ int main(void)

	curl_multi_timeout(multi_handle, &curl_timeo);
	if(curl_timeo >= 0) {
+	#if defined(MSDOS) \|\| defined(__AMIGA__)
+	timeout.tv_sec = (time_t)(curl_timeo / 1000);
+	#else
	timeout.tv_sec = curl_timeo / 1000;
+	#endif
	if(timeout.tv_sec > 1)
	timeout.tv_sec = 1;
	else
+	#if defined(MSDOS) \|\| defined(__AMIGA__)
+	timeout.tv_usec = (time_t)(curl_timeo % 1000) * 1000;
+	#else
	timeout.tv_usec = (int)(curl_timeo % 1000) * 1000;
+	#endif
	}

	/* get file descriptors from the transfers */
@@ -127,7 +135,8 @@ int main(void)
	rc = 0;
	#else
	/* Portable sleep for platforms other than Windows. */
-	struct timeval wait = { 0, 100 * 1000 }; /* 100ms */
+	struct timeval wait = {0};
+	wait.tv_usec = 100 * 1000; /* 100ms */
	rc = select(0, NULL, NULL, NULL, &wait);
	#endif
	}

docs/examples/sendrecv.c+8 -0

@@ -37,8 +37,13 @@ static int wait_on_socket(curl_socket_t sockfd, int for_recv, long timeout_ms)
	fd_set infd, outfd, errfd;
	int res;

+	#if defined(MSDOS) \|\| defined(__AMIGA__)
+	tv.tv_sec = (time_t)(timeout_ms / 1000);
+	tv.tv_usec = (time_t)(timeout_ms % 1000) * 1000;
+	#else
	tv.tv_sec = timeout_ms / 1000;
	tv.tv_usec = (int)(timeout_ms % 1000) * 1000;
+	#endif

	FD_ZERO(&infd);
	FD_ZERO(&outfd);
@@ -51,6 +56,9 @@ static int wait_on_socket(curl_socket_t sockfd, int for_recv, long timeout_ms)
	#if defined(__GNUC__)
	#pragma GCC diagnostic push
	#pragma GCC diagnostic ignored "-Wsign-conversion"
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	#elif defined(_MSC_VER)
	#pragma warning(push)
	#pragma warning(disable:4127) /* conditional expression is constant */

lib/Makefile.am+3 -3

@@ -28,9 +28,9 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
	CHECKSRC_DIST = .checksrc vauth/.checksrc vquic/.checksrc vssh/.checksrc \
	vtls/.checksrc

-	EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \
-	config-riscos.h config-mac.h curl_config.h.in config-dos.h libcurl.rc \
-	config-amigaos.h config-win32ce.h config-os400.h setup-os400.h \
+	EXTRA_DIST = config-win32.h config-win32ce.h config-plan9.h \
+	config-riscos.h config-mac.h curl_config.h.in libcurl.rc \
+	config-win32ce.h config-os400.h setup-os400.h \
	$(CMAKE_DIST) setup-win32.h Makefile.soname optiontable.pl libcurl.def \
	$(CHECKSRC_DIST)

lib/Makefile.mk+0 -340

@@ -1,340 +0,0 @@
-	#***************************************************************************
-	# _ _ ____ _
-	# Project ___\| \| \| \| _ \\| \|
-	# / __\| \| \| \| \|_) \| \|
-	# \| (__\| \|_\| \| _ <\| \|___
-	# \___\|\___/\|_\| \_\_____\|
-	#
-	# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
-	#
-	# This software is licensed as described in the file COPYING, which
-	# you should have received as part of this distribution. The terms
-	# are also available at https://curl.se/docs/copyright.html.
-	#
-	# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-	# copies of the Software, and permit persons to whom the Software is
-	# furnished to do so, under the terms of the COPYING file.
-	#
-	# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-	# KIND, either express or implied.
-	#
-	# SPDX-License-Identifier: curl
-	#
-	#***************************************************************************
-
-	# Makefile to build curl parts with GCC-like toolchains and optional features.
-	#
-	# Usage: make -f Makefile.mk CFG=-feat1[-feat2][-feat3][...]
-	# Example: make -f Makefile.mk CFG=-zlib-ssl-libssh2-ipv6
-	#
-	# Look for ' ?=' to find accepted customization variables.
-
-	# This script is reused by 'src' and 'docs/examples' Makefile.mk scripts.
-
-	ifndef PROOT
-	PROOT := ..
-	LOCAL := 1
-	endif
-
-	### Common
-
-	CFLAGS ?=
-	CPPFLAGS ?=
-	LDFLAGS ?=
-	LIBS ?=
-
-	CROSSPREFIX ?=
-
-	ifeq ($(CC),cc)
-	CC := gcc
-	endif
-	CC := $(CROSSPREFIX)$(CC)
-	AR := $(CROSSPREFIX)$(AR)
-
-	TRIPLET ?= $(shell $(CC) -dumpmachine)
-
-	BIN_EXT :=
-
-	ifneq ($(findstring msdos,$(TRIPLET)),)
-	# Cross-tools: https://github.com/andrewwutw/build-djgpp
-	MSDOS := 1
-	BIN_EXT := .exe
-	else ifneq ($(findstring amigaos,$(TRIPLET)),)
-	# Cross-tools: https://github.com/bebbo/amiga-gcc
-	AMIGA := 1
-	endif
-
-	CPPFLAGS += -I. -I$(PROOT)/include
-
-	### Deprecated settings. For compatibility.
-
-	ifdef WATT_ROOT
-	WATT_PATH := $(realpath $(WATT_ROOT))
-	endif
-
-	### Optional features
-
-	ifneq ($(findstring -debug,$(CFG)),)
-	CFLAGS += -g
-	CPPFLAGS += -DDEBUGBUILD
-	else
-	CPPFLAGS += -DNDEBUG
-	endif
-	ifneq ($(findstring -trackmem,$(CFG)),)
-	CPPFLAGS += -DCURLDEBUG
-	endif
-	ifneq ($(findstring -map,$(CFG)),)
-	MAP := 1
-	endif
-
-	# CPPFLAGS below are only necessary when building libcurl via 'lib' (see
-	# comments below about exceptions). Always include them anyway to match
-	# behavior of other build systems.
-
-	ifneq ($(findstring -sync,$(CFG)),)
-	CPPFLAGS += -DUSE_SYNC_DNS
-	else ifneq ($(findstring -ares,$(CFG)),)
-	LIBCARES_PATH ?= $(PROOT)/../c-ares
-	CPPFLAGS += -DUSE_ARES
-	CPPFLAGS += -isystem "$(LIBCARES_PATH)/include"
-	LDFLAGS += -L"$(LIBCARES_PATH)/lib"
-	LIBS += -lcares
-	endif
-
-	ifneq ($(findstring -rtmp,$(CFG)),)
-	LIBRTMP_PATH ?= $(PROOT)/../librtmp
-	CPPFLAGS += -DUSE_LIBRTMP
-	CPPFLAGS += -isystem "$(LIBRTMP_PATH)"
-	LDFLAGS += -L"$(LIBRTMP_PATH)/librtmp"
-	LIBS += -lrtmp
-	ZLIB := 1
-	endif
-
-	ifneq ($(findstring -ssh2,$(CFG)),)
-	LIBSSH2_PATH ?= $(PROOT)/../libssh2
-	CPPFLAGS += -DUSE_LIBSSH2
-	CPPFLAGS += -isystem "$(LIBSSH2_PATH)/include"
-	LDFLAGS += -L"$(LIBSSH2_PATH)/lib"
-	LIBS += -lssh2
-	else ifneq ($(findstring -libssh,$(CFG)),)
-	LIBSSH_PATH ?= $(PROOT)/../libssh
-	CPPFLAGS += -DUSE_LIBSSH
-	CPPFLAGS += -isystem "$(LIBSSH_PATH)/include"
-	LDFLAGS += -L"$(LIBSSH_PATH)/lib"
-	LIBS += -lssh
-	else ifneq ($(findstring -wolfssh,$(CFG)),)
-	WOLFSSH_PATH ?= $(PROOT)/../wolfssh
-	CPPFLAGS += -DUSE_WOLFSSH
-	CPPFLAGS += -isystem "$(WOLFSSH_PATH)/include"
-	LDFLAGS += -L"$(WOLFSSH_PATH)/lib"
-	LIBS += -lwolfssh
-	endif
-
-	ifneq ($(findstring -ssl,$(CFG)),)
-	OPENSSL_PATH ?= $(PROOT)/../openssl
-	CPPFLAGS += -DUSE_OPENSSL
-	CPPFLAGS += -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
-	OPENSSL_INCLUDE ?= $(OPENSSL_PATH)/include
-	OPENSSL_LIBPATH ?= $(OPENSSL_PATH)/lib
-	CPPFLAGS += -isystem "$(OPENSSL_INCLUDE)"
-	LDFLAGS += -L"$(OPENSSL_LIBPATH)"
-	OPENSSL_LIBS ?= -lssl -lcrypto
-	LIBS += $(OPENSSL_LIBS)
-
-	ifneq ($(findstring -srp,$(CFG)),)
-	ifneq ($(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h),)
-	# OpenSSL 1.0.1 and later.
-	CPPFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP
-	endif
-	endif
-	SSLLIBS += 1
-	endif
-	ifneq ($(findstring -wolfssl,$(CFG)),)
-	WOLFSSL_PATH ?= $(PROOT)/../wolfssl
-	CPPFLAGS += -DUSE_WOLFSSL
-	CPPFLAGS += -DSIZEOF_LONG_LONG=8
-	CPPFLAGS += -isystem "$(WOLFSSL_PATH)/include"
-	LDFLAGS += -L"$(WOLFSSL_PATH)/lib"
-	LIBS += -lwolfssl
-	SSLLIBS += 1
-	endif
-	ifneq ($(findstring -mbedtls,$(CFG)),)
-	MBEDTLS_PATH ?= $(PROOT)/../mbedtls
-	CPPFLAGS += -DUSE_MBEDTLS
-	CPPFLAGS += -isystem "$(MBEDTLS_PATH)/include"
-	LDFLAGS += -L"$(MBEDTLS_PATH)/lib"
-	LIBS += -lmbedtls -lmbedx509 -lmbedcrypto
-	SSLLIBS += 1
-	endif
-	ifneq ($(findstring -bearssl,$(CFG)),)
-	BEARSSL_PATH ?= $(PROOT)/../bearssl
-	CPPFLAGS += -DUSE_BEARSSL
-	CPPFLAGS += -isystem "$(BEARSSL_PATH)/inc"
-	LDFLAGS += -L"$(BEARSSL_PATH)/build"
-	LIBS += -lbearssl
-	SSLLIBS += 1
-	endif
-
-	ifneq ($(findstring -nghttp2,$(CFG)),)
-	NGHTTP2_PATH ?= $(PROOT)/../nghttp2
-	CPPFLAGS += -DUSE_NGHTTP2
-	CPPFLAGS += -isystem "$(NGHTTP2_PATH)/include"
-	LDFLAGS += -L"$(NGHTTP2_PATH)/lib"
-	LIBS += -lnghttp2
-	endif
-
-	ifeq ($(findstring -nghttp3,$(CFG))$(findstring -ngtcp2,$(CFG)),-nghttp3-ngtcp2)
-	NGHTTP3_PATH ?= $(PROOT)/../nghttp3
-	CPPFLAGS += -DUSE_NGHTTP3
-	CPPFLAGS += -isystem "$(NGHTTP3_PATH)/include"
-	LDFLAGS += -L"$(NGHTTP3_PATH)/lib"
-	LIBS += -lnghttp3
-
-	NGTCP2_PATH ?= $(PROOT)/../ngtcp2
-	CPPFLAGS += -DUSE_NGTCP2
-	CPPFLAGS += -isystem "$(NGTCP2_PATH)/include"
-	LDFLAGS += -L"$(NGTCP2_PATH)/lib"
-
-	NGTCP2_LIBS ?=
-	ifeq ($(NGTCP2_LIBS),)
-	ifneq ($(findstring -ssl,$(CFG)),)
-	ifneq ($(wildcard $(OPENSSL_INCLUDE)/openssl/aead.h),)
-	NGTCP2_LIBS := -lngtcp2_crypto_boringssl
-	else # including libressl
-	NGTCP2_LIBS := -lngtcp2_crypto_quictls
-	endif
-	else ifneq ($(findstring -wolfssl,$(CFG)),)
-	NGTCP2_LIBS := -lngtcp2_crypto_wolfssl
-	endif
-	endif
-
-	LIBS += -lngtcp2 $(NGTCP2_LIBS)
-	endif
-
-	ifneq ($(findstring -zlib,$(CFG))$(ZLIB),)
-	ZLIB_PATH ?= $(PROOT)/../zlib
-	# These CPPFLAGS are also required when compiling the curl tool via 'src'.
-	CPPFLAGS += -DHAVE_LIBZ
-	CPPFLAGS += -isystem "$(ZLIB_PATH)/include"
-	LDFLAGS += -L"$(ZLIB_PATH)/lib"
-	ZLIB_LIBS ?= -lz
-	LIBS += $(ZLIB_LIBS)
-	ZLIB := 1
-	endif
-	ifneq ($(findstring -zstd,$(CFG)),)
-	ZSTD_PATH ?= $(PROOT)/../zstd
-	CPPFLAGS += -DHAVE_ZSTD
-	CPPFLAGS += -isystem "$(ZSTD_PATH)/include"
-	LDFLAGS += -L"$(ZSTD_PATH)/lib"
-	ZSTD_LIBS ?= -lzstd
-	LIBS += $(ZSTD_LIBS)
-	endif
-	ifneq ($(findstring -brotli,$(CFG)),)
-	BROTLI_PATH ?= $(PROOT)/../brotli
-	CPPFLAGS += -DHAVE_BROTLI
-	CPPFLAGS += -isystem "$(BROTLI_PATH)/include"
-	LDFLAGS += -L"$(BROTLI_PATH)/lib"
-	BROTLI_LIBS ?= -lbrotlidec -lbrotlicommon
-	LIBS += $(BROTLI_LIBS)
-	endif
-	ifneq ($(findstring -gsasl,$(CFG)),)
-	LIBGSASL_PATH ?= $(PROOT)/../gsasl
-	CPPFLAGS += -DUSE_GSASL
-	CPPFLAGS += -isystem "$(LIBGSASL_PATH)/include"
-	LDFLAGS += -L"$(LIBGSASL_PATH)/lib"
-	LIBS += -lgsasl
-	endif
-
-	ifneq ($(findstring -idn2,$(CFG)),)
-	LIBIDN2_PATH ?= $(PROOT)/../libidn2
-	CPPFLAGS += -DHAVE_LIBIDN2 -DHAVE_IDN2_H
-	CPPFLAGS += -isystem "$(LIBIDN2_PATH)/include"
-	LDFLAGS += -L"$(LIBIDN2_PATH)/lib"
-	LIBS += -lidn2
-
-	ifneq ($(findstring -psl,$(CFG)),)
-	LIBPSL_PATH ?= $(PROOT)/../libpsl
-	CPPFLAGS += -DUSE_LIBPSL
-	CPPFLAGS += -isystem "$(LIBPSL_PATH)/include"
-	LDFLAGS += -L"$(LIBPSL_PATH)/lib"
-	LIBS += -lpsl
-	endif
-	endif
-
-	ifneq ($(findstring -ipv6,$(CFG)),)
-	CPPFLAGS += -DUSE_IPV6
-	endif
-
-	ifneq ($(findstring -watt,$(CFG))$(MSDOS),)
-	WATT_PATH ?= $(PROOT)/../watt
-	CPPFLAGS += -isystem "$(WATT_PATH)/inc"
-	LDFLAGS += -L"$(WATT_PATH)/lib"
-	LIBS += -lwatt
-	endif
-
-	ifneq ($(findstring 11,$(subst $(subst ,, ),,$(SSLLIBS))),)
-	CPPFLAGS += -DCURL_WITH_MULTI_SSL
-	endif
-
-	### Common rules
-
-	OBJ_DIR := $(TRIPLET)
-
-	ifneq ($(findstring /sh,$(SHELL)),)
-	DEL = rm -f $1
-	COPY = -cp -afv $1 $2
-	MKDIR = mkdir -p $1
-	RMDIR = rm -fr $1
-	else
-	DEL = -del 2>NUL /q /f $(subst /,\,$1)
-	COPY = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
-	MKDIR = -md 2>NUL $(subst /,\,$1)
-	RMDIR = -rd 2>NUL /q /s $(subst /,\,$1)
-	endif
-
-	all: $(TARGETS)
-
-	$(OBJ_DIR):
-	-$(call MKDIR, $(OBJ_DIR))
-
-	$(OBJ_DIR)/%.o: %.c
-	$(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-
-	clean:
-	@$(call DEL, $(TOCLEAN))
-	@$(RMDIR) $(OBJ_DIR)
-
-	distclean vclean: clean
-	@$(call DEL, $(TARGETS) $(TOVCLEAN))
-
-	### Local
-
-	ifdef LOCAL
-
-	CPPFLAGS += -DBUILDING_LIBCURL
-
-	### Sources and targets
-
-	# Provides CSOURCES, HHEADERS
-	include Makefile.inc
-
-	vpath %.c vauth vquic vssh vtls
-
-	libcurl_a_LIBRARY := libcurl.a
-
-	TARGETS := $(libcurl_a_LIBRARY)
-
-	libcurl_a_OBJECTS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(notdir $(strip $(CSOURCES))))
-	libcurl_a_DEPENDENCIES := $(strip $(CSOURCES) $(HHEADERS))
-
-	TOCLEAN :=
-	TOVCLEAN :=
-
-	### Rules
-
-	$(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-	@$(call DEL, $@)
-	$(AR) rcs $@ $(libcurl_a_OBJECTS)
-
-	all: $(OBJ_DIR) $(TARGETS)
-	endif

lib/amigaos.c+2 -3

@@ -196,12 +196,11 @@ int Curl_amiga_select(int nfds, fd_set readfds, fd_set writefds,
	*/

	struct Library *SocketBase = NULL;
-	extern int errno, h_errno;

	#ifdef __libnix__
	void __request(const char *msg);
	#else
-	# define __request(msg) Printf(msg "\n\a")
+	# define __request(msg) Printf((const unsigned char *)(msg "\n\a"), 0)
	#endif

	void Curl_amiga_cleanup(void)
@@ -215,7 +214,7 @@ void Curl_amiga_cleanup(void)
	CURLcode Curl_amiga_init(void)
	{
	if(!SocketBase)
-	SocketBase = OpenLibrary("bsdsocket.library", 4);
+	SocketBase = OpenLibrary((const unsigned char *)"bsdsocket.library", 4);

	if(!SocketBase) {
	__request("No TCP/IP Stack running!");

lib/config-amigaos.h+0 -127

@@ -1,127 +0,0 @@
-	#ifndef HEADER_CURL_CONFIG_AMIGAOS_H
-	#define HEADER_CURL_CONFIG_AMIGAOS_H
-	/***************************************************************************
-	* _ _ ____ _
-	* Project ___\| \| \| \| _ \\| \|
-	* / __\| \| \| \| \|_) \| \|
-	* \| (__\| \|_\| \| _ <\| \|___
-	* \___\|\___/\|_\| \_\_____\|
-	*
-	* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
-	*
-	* This software is licensed as described in the file COPYING, which
-	* you should have received as part of this distribution. The terms
-	* are also available at https://curl.se/docs/copyright.html.
-	*
-	* You may opt to use, copy, modify, merge, publish, distribute and/or sell
-	* copies of the Software, and permit persons to whom the Software is
-	* furnished to do so, under the terms of the COPYING file.
-	*
-	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-	* KIND, either express or implied.
-	*
-	* SPDX-License-Identifier: curl
-	*
-	***************************************************************************/
-
-	/* ================================================================ */
-	/* Hand crafted config file for AmigaOS */
-	/* ================================================================ */
-
-	#ifdef __AMIGA__ /* Any AmigaOS flavour */
-
-	#define HAVE_ARPA_INET_H 1
-	#define HAVE_CLOSESOCKET_CAMEL 1
-	#define HAVE_IOCTLSOCKET_CAMEL 1
-	#define HAVE_IOCTLSOCKET_CAMEL_FIONBIO 1
-	#define HAVE_LONGLONG 1
-	#define HAVE_NETDB_H 1
-	#define HAVE_NETINET_IN_H 1
-	#define HAVE_NET_IF_H 1
-	#define HAVE_PWD_H 1
-	#define HAVE_SELECT 1
-	#define HAVE_SIGNAL 1
-	#define HAVE_SOCKET 1
-	#define HAVE_STRCASECMP 1
-	#define HAVE_STRDUP 1
-	#define HAVE_STRICMP 1
-	#define HAVE_STRINGS_H 1
-	#define HAVE_STRUCT_TIMEVAL 1
-	#define HAVE_SYS_PARAM_H 1
-	#define HAVE_SYS_SOCKET_H 1
-	#define HAVE_SYS_SOCKIO_H 1
-	#define HAVE_SYS_STAT_H 1
-	#define HAVE_SYS_TIME_H 1
-	#define HAVE_SYS_TYPES_H 1
-	#define HAVE_UNISTD_H 1
-	#define HAVE_UTIME 1
-	#define HAVE_UTIME_H 1
-	#define HAVE_WRITABLE_ARGV 1
-	#define HAVE_SYS_IOCTL_H 1
-
-	#define SIZEOF_INT 4
-	#define SIZEOF_SIZE_T 4
-
-	#ifndef SIZEOF_CURL_OFF_T
-	#define SIZEOF_CURL_OFF_T 8
-	#endif
-
-	#define USE_MANUAL 1
-	#define CURL_DISABLE_LDAP 1
-
-	#ifndef CURL_OS
-	#define CURL_OS "AmigaOS"
-	#endif
-
-	#define PACKAGE "curl"
-	#define PACKAGE_BUGREPORT "a suitable mailing list: https://curl.se/mail/"
-	#define PACKAGE_NAME "curl"
-	#define PACKAGE_STRING "curl -"
-	#define PACKAGE_TARNAME "curl"
-	#define PACKAGE_VERSION "-"
-
-	#if defined(USE_AMISSL)
-	#define CURL_CA_PATH "AmiSSL:Certs"
-	#elif defined(__MORPHOS__)
-	#define CURL_CA_BUNDLE "MOSSYS:Data/SSL/curl-ca-bundle.crt"
-	#else
-	#define CURL_CA_BUNDLE "s:curl-ca-bundle.crt"
-	#endif
-
-	#define STDC_HEADERS 1
-
-	#define in_addr_t int
-
-	#ifndef F_OK
-	# define F_OK 0
-	#endif
-
-	#ifndef O_RDONLY
-	# define O_RDONLY 0x0000
-	#endif
-
-	#ifndef LONG_MAX
-	# define LONG_MAX 0x7fffffffL
-	#endif
-
-	#ifndef LONG_MIN
-	# define LONG_MIN (-0x7fffffffL-1)
-	#endif
-
-	#define HAVE_RECV 1
-	#define RECV_TYPE_ARG1 long
-	#define RECV_TYPE_ARG2 char *
-	#define RECV_TYPE_ARG3 long
-	#define RECV_TYPE_ARG4 long
-	#define RECV_TYPE_RETV long
-
-	#define HAVE_SEND 1
-	#define SEND_TYPE_ARG1 int
-	#define SEND_QUAL_ARG2 const
-	#define SEND_TYPE_ARG2 char *
-	#define SEND_TYPE_ARG3 int
-	#define SEND_TYPE_ARG4 int
-	#define SEND_TYPE_RETV int
-
-	#endif /* __AMIGA__ */
-	#endif /* HEADER_CURL_CONFIG_AMIGAOS_H */

lib/config-dos.h+0 -136

@@ -1,136 +0,0 @@
-	#ifndef HEADER_CURL_CONFIG_DOS_H
-	#define HEADER_CURL_CONFIG_DOS_H
-	/***************************************************************************
-	* _ _ ____ _
-	* Project ___\| \| \| \| _ \\| \|
-	* / __\| \| \| \| \|_) \| \|
-	* \| (__\| \|_\| \| _ <\| \|___
-	* \___\|\___/\|_\| \_\_____\|
-	*
-	* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
-	*
-	* This software is licensed as described in the file COPYING, which
-	* you should have received as part of this distribution. The terms
-	* are also available at https://curl.se/docs/copyright.html.
-	*
-	* You may opt to use, copy, modify, merge, publish, distribute and/or sell
-	* copies of the Software, and permit persons to whom the Software is
-	* furnished to do so, under the terms of the COPYING file.
-	*
-	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-	* KIND, either express or implied.
-	*
-	* SPDX-License-Identifier: curl
-	*
-	***************************************************************************/
-
-
-	/* ================================================================ */
-	/* lib/config-dos.h - Hand crafted config file for DOS */
-	/* ================================================================ */
-
-	#ifndef CURL_OS
-	#if defined(DJGPP)
-	#define CURL_OS "MSDOS/djgpp"
-	#elif defined(__HIGHC__)
-	#define CURL_OS "MSDOS/HighC"
-	#else
-	#define CURL_OS "MSDOS/?"
-	#endif
-	#endif
-
-	#define PACKAGE "curl"
-
-	#define USE_MANUAL 1
-
-	#define HAVE_ARPA_INET_H 1
-	#define HAVE_FCNTL_H 1
-	#define HAVE_FREEADDRINFO 1
-	#define HAVE_GETADDRINFO 1
-	#define HAVE_GETTIMEOFDAY 1
-	#define HAVE_IO_H 1
-	#define HAVE_IOCTL_FIONBIO 1
-	#define HAVE_IOCTLSOCKET 1
-	#define HAVE_IOCTLSOCKET_FIONBIO 1
-	#define HAVE_LOCALE_H 1
-	#define HAVE_LONGLONG 1
-	#define HAVE_NETDB_H 1
-	#define HAVE_NETINET_IN_H 1
-	#define HAVE_NETINET_TCP_H 1
-	#define HAVE_NET_IF_H 1
-	#define HAVE_RECV 1
-	#define HAVE_SELECT 1
-	#define HAVE_SEND 1
-	#define HAVE_SETLOCALE 1
-	#define HAVE_SETMODE 1
-	#define HAVE_SIGNAL 1
-	#define HAVE_SOCKET 1
-	#define HAVE_STRDUP 1
-	#define HAVE_STRICMP 1
-	#define HAVE_STRTOLL 1
-	#define HAVE_STRUCT_TIMEVAL 1
-	#define HAVE_SYS_IOCTL_H 1
-	#define HAVE_SYS_SOCKET_H 1
-	#define HAVE_SYS_STAT_H 1
-	#define HAVE_SYS_TYPES_H 1
-	#define HAVE_UNISTD_H 1
-
-	#define SIZEOF_INT 4
-	#define SIZEOF_LONG 4
-	#define SIZEOF_SIZE_T 4
-	#define SIZEOF_CURL_OFF_T 8
-	#define STDC_HEADERS 1
-
-	/* Qualifiers for send() and recv() */
-
-	#define SEND_TYPE_ARG1 int
-	#define SEND_QUAL_ARG2 const
-	#define SEND_TYPE_ARG2 void *
-	#define SEND_TYPE_ARG3 int
-	#define SEND_TYPE_ARG4 int
-	#define SEND_TYPE_RETV int
-
-	#define RECV_TYPE_ARG1 int
-	#define RECV_TYPE_ARG2 void *
-	#define RECV_TYPE_ARG3 int
-	#define RECV_TYPE_ARG4 int
-	#define RECV_TYPE_RETV int
-
-	#define BSD
-
-	/* CURLDEBUG definition enables memory tracking */
-	/* #define CURLDEBUG */
-
-	/* to disable LDAP */
-	#define CURL_DISABLE_LDAP 1
-
-	#define in_addr_t u_long
-
-	#if defined(__HIGHC__) \|\| \
-	(defined(__GNUC__) && (__GNUC__ < 4))
-	#define ssize_t int
-	#endif
-
-	/* Target HAVE_x section */
-
-	#if defined(DJGPP)
-	#define HAVE_BASENAME 1
-	#define HAVE_STRCASECMP 1
-	#define HAVE_SIGACTION 1
-	#define HAVE_SIGSETJMP 1
-	#define HAVE_SYS_TIME_H 1
-	#define HAVE_TERMIOS_H 1
-
-	#elif defined(__HIGHC__)
-	#define HAVE_SYS_TIME_H 1
-	#define strerror(e) strerror_s_((e))
-	#endif
-
-	#ifdef MSDOS /* Watt-32 */
-	#define HAVE_CLOSE_S 1
-	#endif
-
-	#undef word
-	#undef byte
-
-	#endif /* HEADER_CURL_CONFIG_DOS_H */

lib/curl_addrinfo.c+0 -8

@@ -318,11 +318,7 @@ Curl_he2ai(const struct hostent *he, int port)
	addr = (void )ai->ai_addr; / storage area for this info */

	memcpy(&addr->sin_addr, curr, sizeof(struct in_addr));
-	#ifdef __MINGW32__
-	addr->sin_family = (short)(he->h_addrtype);
-	#else
	addr->sin_family = (CURL_SA_FAMILY_T)(he->h_addrtype);
-	#endif
	addr->sin_port = htons((unsigned short)port);
	break;

@@ -331,11 +327,7 @@ Curl_he2ai(const struct hostent *he, int port)
	addr6 = (void )ai->ai_addr; / storage area for this info */

	memcpy(&addr6->sin6_addr, curr, sizeof(struct in6_addr));
-	#ifdef __MINGW32__
-	addr6->sin6_family = (short)(he->h_addrtype);
-	#else
	addr6->sin6_family = (CURL_SA_FAMILY_T)(he->h_addrtype);
-	#endif
	addr6->sin6_port = htons((unsigned short)port);
	break;
	#endif

lib/curl_config.h.cmake+6 -0

@@ -736,6 +736,9 @@ ${SIZEOF_TIME_T_CODE}
	/* if OpenSSL is in use */
	#cmakedefine USE_OPENSSL 1

+	/* if AmiSSL is in use */
+	#cmakedefine USE_AMISSL 1
+
	/* if librtmp/rtmpdump is in use */
	#cmakedefine USE_LIBRTMP 1

@@ -785,6 +788,9 @@ ${SIZEOF_TIME_T_CODE}
	/* to enable Windows SSL */
	#cmakedefine USE_SCHANNEL 1

+	/* if Watt-32 is in use */
+	#cmakedefine USE_WATT32 1
+
	/* enable multiple SSL backends */
	#cmakedefine CURL_WITH_MULTI_SSL 1

lib/curl_gethostname.c+4 -0

@@ -73,7 +73,11 @@ int Curl_gethostname(char * const name, GETHOSTNAME_TYPE_ARG2 namelen)
	#else /* DEBUGBUILD */

	name[0] = '\0';
+	#ifdef __AMIGA__
+	err = gethostname((unsigned char *)name, namelen);
+	#else
	err = gethostname(name, namelen);
+	#endif

	#endif

lib/curl_setup.h+10 -8

@@ -149,10 +149,6 @@
	# include "config-riscos.h"
	#endif

-	#ifdef __AMIGA__
-	# include "config-amigaos.h"
-	#endif
-
	#ifdef __OS400__
	# include "config-os400.h"
	#endif
@@ -161,10 +157,6 @@
	# include "config-plan9.h"
	#endif

-	#ifdef MSDOS
-	# include "config-dos.h"
-	#endif
-
	#endif /* HAVE_CONFIG_H */

	/* ================================================================ */
@@ -491,6 +483,14 @@
	FILE curlx_win32_fopen(const char filename, const char *mode);
	#endif

+	#ifdef __DJGPP__
+	/* Requires DJGPP 2.04 */
+	# include <unistd.h>
+	# undef lseek
+	# define lseek(fdes,offset,whence) llseek(fdes, offset, whence)
+	# define LSEEK_ERROR (offset_t)-1
+	#endif
+
	/*
	* Small file (<2Gb) support using Win32 functions.
	*/
@@ -908,6 +908,8 @@ endings either CRLF or LF so 't' is appropriate.
	# define CURL_SA_FAMILY_T sa_family_t
	# elif defined(HAVE_ADDRESS_FAMILY)
	# define CURL_SA_FAMILY_T ADDRESS_FAMILY
+	# elif defined(__AMIGA__)
+	# define CURL_SA_FAMILY_T unsigned char
	# else
	/* use a sensible default */
	# define CURL_SA_FAMILY_T unsigned short

lib/curl_setup_once.h+1 -1

@@ -187,7 +187,7 @@ struct timeval {
	# define sclose(x) closesocket((x))
	#elif defined(HAVE_CLOSESOCKET_CAMEL)
	# define sclose(x) CloseSocket((x))
-	#elif defined(HAVE_CLOSE_S)
+	#elif defined(MSDOS) /* Watt-32 */
	# define sclose(x) close_s((x))
	#elif defined(USE_LWIPSOCK)
	# define sclose(x) lwip_close((x))

lib/doh.c+2 -10

@@ -961,11 +961,7 @@ static CURLcode doh2ai(const struct dohentry de, const char hostname,
	addr = (void )ai->ai_addr; / storage area for this info */
	DEBUGASSERT(sizeof(struct in_addr) == sizeof(de->addr[i].ip.v4));
	memcpy(&addr->sin_addr, &de->addr[i].ip.v4, sizeof(struct in_addr));
-	#ifdef __MINGW32__
-	addr->sin_family = (short)addrtype;
-	#else
-	addr->sin_family = addrtype;
-	#endif
+	addr->sin_family = (CURL_SA_FAMILY_T)addrtype;
	addr->sin_port = htons((unsigned short)port);
	break;

@@ -974,11 +970,7 @@ static CURLcode doh2ai(const struct dohentry de, const char hostname,
	addr6 = (void )ai->ai_addr; / storage area for this info */
	DEBUGASSERT(sizeof(struct in6_addr) == sizeof(de->addr[i].ip.v6));
	memcpy(&addr6->sin6_addr, &de->addr[i].ip.v6, sizeof(struct in6_addr));
-	#ifdef __MINGW32__
-	addr6->sin6_family = (short)addrtype;
-	#else
-	addr6->sin6_family = addrtype;
-	#endif
+	addr6->sin6_family = (CURL_SA_FAMILY_T)addrtype;
	addr6->sin6_port = htons((unsigned short)port);
	break;
	#endif

lib/file.c+5 -0

@@ -553,8 +553,13 @@ static CURLcode file_do(struct Curl_easy data, bool done)

	if(data->state.resume_from) {
	if(!S_ISDIR(statbuf.st_mode)) {
+	#ifdef __AMIGA__
+	if(data->state.resume_from !=
+	lseek(fd, (off_t)data->state.resume_from, SEEK_SET))
+	#else
	if(data->state.resume_from !=
	lseek(fd, data->state.resume_from, SEEK_SET))
+	#endif
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	else {

lib/ftp.c+9 -0

@@ -2079,10 +2079,19 @@ static CURLcode ftp_state_mdtm_resp(struct Curl_easy *data,
	/* If we asked for a time of the file and we actually got one as well,
	we "emulate" an HTTP-style header in our output. */

+	#if defined(__GNUC__) && (defined(__DJGPP__) \|\| defined(__AMIGA__))
+	#pragma GCC diagnostic push
+	/* 'time_t' is unsigned in MSDOS and AmigaOS. Silence:
+	warning: comparison of unsigned expression in '>= 0' is always true */
+	#pragma GCC diagnostic ignored "-Wtype-limits"
+	#endif
	if(data->req.no_body &&
	ftpc->file &&
	data->set.get_filetime &&
	(data->info.filetime >= 0) ) {
+	#if defined(__GNUC__) && (defined(__DJGPP__) \|\| defined(__AMIGA__))
+	#pragma GCC diagnostic pop
+	#endif
	char headerbuf[128];
	int headerbuflen;
	time_t filetime = data->info.filetime;

lib/functypes.h+1 -0

@@ -62,6 +62,7 @@

	/* int send(int, const char , int, int); /
	#define SEND_TYPE_ARG1 int
+	#define SEND_QUAL_ARG2
	#define SEND_TYPE_ARG2 char *
	#define SEND_TYPE_ARG3 int
	#define SEND_TYPE_RETV int

lib/getinfo.c+2 -0

@@ -238,8 +238,10 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
	case CURLINFO_FILETIME:
	if(data->info.filetime > LONG_MAX)
	*param_longp = LONG_MAX;
+	#if !defined(MSDOS) && !defined(__AMIGA__)
	else if(data->info.filetime < LONG_MIN)
	*param_longp = LONG_MIN;
+	#endif
	else
	*param_longp = (long)data->info.filetime;
	break;

lib/hostip.c+3 -1

@@ -198,7 +198,7 @@ hostcache_entry_is_stale(void datap, void hc)
	if(dns->timestamp) {
	/* age in seconds */
	time_t age = prune->now - dns->timestamp;
-	if(age >= prune->max_age_sec)
+	if(age >= (time_t)prune->max_age_sec)
	return TRUE;
	if(age > prune->oldest)
	prune->oldest = age;
@@ -541,7 +541,9 @@ static struct Curl_addrinfo get_localhost6(int port, const char name)
	sa6.sin6_family = AF_INET6;
	sa6.sin6_port = htons(port16);
	sa6.sin6_flowinfo = 0;
+	#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
	sa6.sin6_scope_id = 0;
+	#endif

	(void)Curl_inet_pton(AF_INET6, "::1", ipv6);
	memcpy(&sa6.sin6_addr, ipv6, sizeof(ipv6));

lib/http.c+1 -1

@@ -2903,7 +2903,7 @@ CURLcode Curl_http_header(struct Curl_easy *data,
	(void)curlx_strtoofft(v, NULL, 10, &retry_after);
	if(!retry_after) {
	time_t date = Curl_getdate_capped(v);
-	if(-1 != date)
+	if((time_t)-1 != date)
	/* convert date to number of seconds into the future */
	retry_after = date - time(NULL);
	}

lib/inet_ntop.h+4 -0

@@ -35,6 +35,10 @@ char Curl_inet_ntop(int af, const void addr, char *buf, size_t size);
	#ifdef _WIN32
	#define Curl_inet_ntop(af,addr,buf,size) \
	inet_ntop(af, addr, buf, size)
+	#elif defined(__AMIGA__)
+	#define Curl_inet_ntop(af,addr,buf,size) \
+	(char )inet_ntop(af, (void )addr, (unsigned char *)buf, \
+	(curl_socklen_t)(size))
	#else
	#define Curl_inet_ntop(af,addr,buf,size) \
	inet_ntop(af, addr, buf, (curl_socklen_t)(size))

lib/inet_pton.h+4 -0

@@ -32,7 +32,11 @@ int Curl_inet_pton(int, const char , void );
	#ifdef HAVE_ARPA_INET_H
	#include <arpa/inet.h>
	#endif
+	#if defined(__AMIGA__)
+	#define Curl_inet_pton(x,y,z) inet_pton(x,(unsigned char *)y,z)
+	#else
	#define Curl_inet_pton(x,y,z) inet_pton(x,y,z)
	#endif
+	#endif

	#endif /* HEADER_CURL_INET_PTON_H */

lib/multi.c+7 -0

@@ -1170,10 +1170,17 @@ CURLMcode curl_multi_fdset(CURLM *m,
	if(!FDSET_SOCK(data->last_poll.sockets[i]))
	/* pretend it does not exist */
	continue;
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	if(data->last_poll.actions[i] & CURL_POLL_IN)
	FD_SET(data->last_poll.sockets[i], read_fd_set);
	if(data->last_poll.actions[i] & CURL_POLL_OUT)
	FD_SET(data->last_poll.sockets[i], write_fd_set);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if((int)data->last_poll.sockets[i] > this_max_fd)
	this_max_fd = (int)data->last_poll.sockets[i];
	}

lib/netrc.c+2 -0

@@ -26,7 +26,9 @@
	#ifndef CURL_DISABLE_NETRC

	#ifdef HAVE_PWD_H
+	#undef __NO_NET_API /* required for AmigaOS to declare getpwuid() */
	#include <pwd.h>
+	#define __NO_NET_API
	#endif

	#include <curl/curl.h>

lib/nonblock.c+6 -6

@@ -63,6 +63,12 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
	flags &= ~O_NONBLOCK;
	return sfcntl(sockfd, F_SETFL, flags);

+	#elif defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
+
+	/* Amiga */
+	long flags = nonblock ? 1L : 0L;
+	return IoctlSocket(sockfd, FIONBIO, (char *)&flags);
+
	#elif defined(HAVE_IOCTL_FIONBIO)

	/* older Unix versions */
@@ -75,12 +81,6 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
	unsigned long flags = nonblock ? 1UL : 0UL;
	return ioctlsocket(sockfd, (long)FIONBIO, &flags);

-	#elif defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
-
-	/* Amiga */
-	long flags = nonblock ? 1L : 0L;
-	return IoctlSocket(sockfd, FIONBIO, (char *)&flags);
-
	#elif defined(HAVE_SETSOCKOPT_SO_NONBLOCK)

	/* Orbis OS */

lib/parsedate.c+3 -3

@@ -558,7 +558,7 @@ static int parsedate(const char date, time_t output)
	if(tzoff == -1)
	tzoff = 0;

-	if((tzoff > 0) && (t > TIME_T_MAX - tzoff)) {
+	if((tzoff > 0) && (t > (time_t)(TIME_T_MAX - tzoff))) {
	*output = TIME_T_MAX;
	return PARSEDATE_LATER; /* time_t overflow */
	}
@@ -586,7 +586,7 @@ time_t curl_getdate(const char p, const time_t now)
	(void)now; /* legacy argument from the past that we ignore */

	if(rc == PARSEDATE_OK) {
-	if(parsed == -1)
+	if(parsed == (time_t)-1)
	/* avoid returning -1 for a working scenario */
	parsed++;
	return parsed;
@@ -606,7 +606,7 @@ time_t Curl_getdate_capped(const char *p)

	switch(rc) {
	case PARSEDATE_OK:
-	if(parsed == -1)
+	if(parsed == (time_t)-1)
	/* avoid returning -1 for a working scenario */
	parsed++;
	return parsed;

lib/select.c+1 -1

@@ -78,7 +78,7 @@ int Curl_wait_ms(timediff_t timeout_ms)
	return -1;
	}
	#if defined(MSDOS)
-	delay(timeout_ms);
+	delay((unsigned int)timeout_ms);
	#elif defined(_WIN32)
	/* prevent overflow, timeout_ms is typecast to ULONG/DWORD. */
	#if TIMEDIFF_T_MAX >= ULONG_MAX

lib/tftp.c+1 -1

@@ -524,7 +524,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
	not have a size_t argument, like older unixes that want an 'int' */
	senddata = sendto(state->sockfd, (void *)state->spacket.data,
	(SEND_TYPE_ARG3)sbytes, 0,
-	&data->conn->remote_addr->curl_sa_addr,
+	(struct sockaddr *)&data->conn->remote_addr->curl_sa_addr,
	(curl_socklen_t)data->conn->remote_addr->addrlen);
	if(senddata != (ssize_t)sbytes) {
	char buffer[STRERROR_LEN];

m4/curl-amissl.m4+1 -0

@@ -50,6 +50,7 @@ if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then
	check_for_ca_bundle=1
	with_ca_fallback=yes
	LIBS="-lamisslstubs -lamisslauto $LIBS"
+	CURL_NETWORK_AND_TIME_LIBS="-lamisslstubs -lamisslauto $CURL_NETWORK_AND_TIME_LIBS"
	AC_DEFINE(USE_AMISSL, 1, [if AmiSSL is in use])
	AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use])
	AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \

m4/curl-confopts.m4+12 -1

@@ -43,9 +43,20 @@ AS_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
	dnl --disable-threaded-resolver option used
	want_thres="no"
	;;
+	yes)
+	dnl --enable-threaded-resolver option used
+	want_thres="yes"
+	;;
	*)
	dnl configure option not specified
-	want_thres="yes"
+	case $host_os in
+	msdos* \| amiga*)
+	want_thres="no"
+	;;
+	*)
+	want_thres="yes"
+	;;
+	esac
	;;
	esac
	AC_MSG_RESULT([$want_thres])

m4/curl-functions.m4+0 -31

@@ -742,7 +742,6 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET_CAMEL], [
	AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl
	#
	tst_links_closesocket_camel="unknown"
-	tst_proto_closesocket_camel="unknown"
	tst_compi_closesocket_camel="unknown"
	tst_allow_closesocket_camel="unknown"
	#
@@ -764,20 +763,6 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET_CAMEL], [
	])
	#
	if test "$tst_links_closesocket_camel" = "yes"; then
-	AC_MSG_CHECKING([if CloseSocket is prototyped])
-	AC_EGREP_CPP([CloseSocket],[
-	$curl_includes_bsdsocket
-	$curl_includes_sys_socket
-	],[
-	AC_MSG_RESULT([yes])
-	tst_proto_closesocket_camel="yes"
-	],[
-	AC_MSG_RESULT([no])
-	tst_proto_closesocket_camel="no"
-	])
-	fi
-	#
-	if test "$tst_proto_closesocket_camel" = "yes"; then
	AC_MSG_CHECKING([if CloseSocket is compilable])
	AC_COMPILE_IFELSE([
	AC_LANG_PROGRAM([[
@@ -809,7 +794,6 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET_CAMEL], [
	#
	AC_MSG_CHECKING([if CloseSocket might be used])
	if test "$tst_links_closesocket_camel" = "yes" &&
-	test "$tst_proto_closesocket_camel" = "yes" &&
	test "$tst_compi_closesocket_camel" = "yes" &&
	test "$tst_allow_closesocket_camel" = "yes"; then
	AC_MSG_RESULT([yes])
@@ -2870,7 +2854,6 @@ AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL], [
	AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl
	#
	tst_links_ioctlsocket_camel="unknown"
-	tst_proto_ioctlsocket_camel="unknown"
	tst_compi_ioctlsocket_camel="unknown"
	tst_allow_ioctlsocket_camel="unknown"
	#
@@ -2890,19 +2873,6 @@ AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL], [
	])
	#
	if test "$tst_links_ioctlsocket_camel" = "yes"; then
-	AC_MSG_CHECKING([if IoctlSocket is prototyped])
-	AC_EGREP_CPP([IoctlSocket],[
-	$curl_includes_bsdsocket
-	],[
-	AC_MSG_RESULT([yes])
-	tst_proto_ioctlsocket_camel="yes"
-	],[
-	AC_MSG_RESULT([no])
-	tst_proto_ioctlsocket_camel="no"
-	])
-	fi
-	#
-	if test "$tst_proto_ioctlsocket_camel" = "yes"; then
	AC_MSG_CHECKING([if IoctlSocket is compilable])
	AC_COMPILE_IFELSE([
	AC_LANG_PROGRAM([[
@@ -2933,7 +2903,6 @@ AC_DEFUN([CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL], [
	#
	AC_MSG_CHECKING([if IoctlSocket might be used])
	if test "$tst_links_ioctlsocket_camel" = "yes" &&
-	test "$tst_proto_ioctlsocket_camel" = "yes" &&
	test "$tst_compi_ioctlsocket_camel" = "yes" &&
	test "$tst_allow_ioctlsocket_camel" = "yes"; then
	AC_MSG_RESULT([yes])

src/Makefile.am+1 -1

@@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
	.DELETE_ON_ERROR:

	EXTRA_DIST = mk-file-embed.pl mkhelp.pl \
-	Makefile.mk curl.rc Makefile.inc CMakeLists.txt .checksrc
+	curl.rc Makefile.inc CMakeLists.txt .checksrc

	# Specify our include paths here, and do it relative to $(top_srcdir) and
	# $(top_builddir), to ensure that these paths which belong to the library

src/Makefile.mk+0 -95

@@ -1,95 +0,0 @@
-	#***************************************************************************
-	# _ _ ____ _
-	# Project ___\| \| \| \| _ \\| \|
-	# / __\| \| \| \| \|_) \| \|
-	# \| (__\| \|_\| \| _ <\| \|___
-	# \___\|\___/\|_\| \_\_____\|
-	#
-	# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
-	#
-	# This software is licensed as described in the file COPYING, which
-	# you should have received as part of this distribution. The terms
-	# are also available at https://curl.se/docs/copyright.html.
-	#
-	# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-	# copies of the Software, and permit persons to whom the Software is
-	# furnished to do so, under the terms of the COPYING file.
-	#
-	# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-	# KIND, either express or implied.
-	#
-	# SPDX-License-Identifier: curl
-	#
-	#***************************************************************************
-
-	# See usage in lib/Makefile.mk
-
-	PROOT := ..
-
-	### Common
-
-	include $(PROOT)/lib/Makefile.mk
-
-	### Local
-
-	CPPFLAGS += -I$(PROOT)/lib
-	LDFLAGS += -L$(PROOT)/lib
-	LIBS := -lcurl $(LIBS)
-
-	### Sources and targets
-
-	# Provides CURL_CFILES, CURLX_CFILES
-	include Makefile.inc
-
-	TARGETS := curl$(BIN_EXT)
-
-	CURL_CFILES += $(notdir $(CURLX_CFILES))
-
-	ifneq ($(CURL_CA_EMBED),)
-	CPPFLAGS += -DCURL_CA_EMBED
-	CURL_CFILES += tool_ca_embed.c
-	endif
-
-	curl_OBJECTS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(strip $(CURL_CFILES)))
-	ifdef MAP
-	CURL_MAP := curl.map
-	LDFLAGS += -Wl,-Map,$(CURL_MAP)
-	TOVCLEAN := $(CURL_MAP)
-	endif
-	vpath %.c $(PROOT)/lib
-
-	TOCLEAN := $(curl_OBJECTS)
-
-	### Rules
-
-	PERL ?= perl
-
-	ifneq ($(wildcard tool_hugehelp.c.cvs),)
-	TOCLEAN += tool_hugehelp.c
-	# Load DPAGES
-	include $(PROOT)/docs/cmdline-opts/Makefile.inc
-	$(PROOT)/docs/cmdline-opts/curl.txt: $(addprefix $(PROOT)/docs/cmdline-opts/,$(DPAGES)) $(PROOT)/scripts/managen
-	cd $(PROOT)/docs/cmdline-opts && $(PERL) ../../scripts/managen ascii $(DPAGES) > curl.txt
-	# Necessary for the generated tools_hugehelp.c
-	CPPFLAGS += -DUSE_MANUAL
-	ifdef ZLIB
-	_MKHELPOPT += -c
-	endif
-	tool_hugehelp.c: $(PROOT)/docs/cmdline-opts/curl.txt mkhelp.pl
-	$(PERL) mkhelp.pl $(_MKHELPOPT) < $< > $@
-	else
-	tool_hugehelp.c:
-	@echo Creating $@
-	@$(call COPY, [email protected], $@)
-	endif
-
-	ifneq ($(CURL_CA_EMBED),)
-	TOCLEAN += tool_ca_embed.c
-	tool_ca_embed.c: mk-file-embed.pl
-	$(PERL) mk-file-embed.pl --var curl_ca_embed < $(CURL_CA_EMBED) > $@
-	endif
-
-	$(TARGETS): $(curl_OBJECTS) $(PROOT)/lib/libcurl.a
-	$(CC) $(LDFLAGS) -o $@ $(curl_OBJECTS) $(LIBS)
-
-	all: $(OBJ_DIR) $(TARGETS)

src/tool_cb_rea.c+7 -0

@@ -74,7 +74,14 @@ size_t tool_read_cb(char buffer, size_t sz, size_t nmemb, void userdata)
	timeout.tv_usec = (int)((wait%1000)*1000);

	FD_ZERO(&bits);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(per->infd, &bits);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(!select(per->infd + 1, &bits, NULL, NULL, &timeout))
	return 0; /* timeout */
	}

src/tool_cb_see.c+4 -0

@@ -80,7 +80,11 @@ int tool_seek_cb(void *userdata, curl_off_t offset, int whence)
	}
	#endif

+	#ifdef __AMIGA__
+	if(LSEEK_ERROR == lseek(per->infd, (off_t)offset, whence))
+	#else
	if(LSEEK_ERROR == lseek(per->infd, offset, whence))
+	#endif
	/* could not rewind, the reason is in errno but errno is just not portable
	enough and we do not actually care that much why we failed. We will let
	libcurl know that it may try other means if it wants to. */

src/tool_doswin.c+4 -3

@@ -242,7 +242,8 @@ SANITIZE_ERR_OK: Good -- 'path' can be truncated
	SANITIZE_ERR_INVALID_PATH: Bad -- 'path' cannot be truncated
	!= SANITIZE_ERR_OK && != SANITIZE_ERR_INVALID_PATH: Error
	*/
-	SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos)
+	static SANITIZEcode truncate_dryrun(const char *path,
+	const size_t truncate_pos)
	{
	size_t len;

@@ -291,8 +292,8 @@ sanitize_file_name.
	Success: (SANITIZE_ERR_OK) *sanitized points to a sanitized copy of file_name.
	Failure: (!= SANITIZE_ERR_OK) *sanitized is NULL.
	*/
-	SANITIZEcode msdosify(char *const sanitized, const char file_name,
-	int flags)
+	static SANITIZEcode msdosify(char *const sanitized, const char file_name,
+	int flags)
	{
	char dos_name[PATH_MAX];
	static const char illegal_chars_dos[] = ".+, ;=[]" /* illegal in DOS */

src/tool_doswin.h+0 -8

@@ -40,14 +40,6 @@ typedef enum {

	SANITIZEcode sanitize_file_name(char *const sanitized, const char file_name,
	int flags);
-	#ifdef UNITTESTS
-	SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos);
-	SANITIZEcode msdosify(char *const sanitized, const char file_name,
-	int flags);
-	SANITIZEcode rename_if_reserved_dos_device_name(char **const sanitized,
-	const char *file_name,
-	int flags);
-	#endif /* UNITTESTS */

	#if defined(MSDOS) && (defined(__DJGPP__) \|\| defined(__GO32__))

src/tool_findfile.c+3 -2

@@ -24,8 +24,9 @@
	#include "tool_setup.h"

	#ifdef HAVE_PWD_H
-	# undef __NO_NET_API /* required for building for AmigaOS */
-	# include <pwd.h>
+	#undef __NO_NET_API /* required for AmigaOS to declare getpwuid() */
+	#include <pwd.h>
+	#define __NO_NET_API
	#endif

	#ifdef HAVE_SYS_STAT_H

src/tool_getparam.c+0 -4

@@ -45,10 +45,6 @@

	#include "memdebug.h" /* keep this as LAST include */

-	#ifdef MSDOS
-	# define USE_WATT32
-	#endif
-
	#define ALLOW_BLANK TRUE
	#define DENY_BLANK FALSE

src/tool_help.c+0 -4

@@ -36,10 +36,6 @@

	#include "memdebug.h" /* keep this as LAST include */

-	#ifdef MSDOS
-	# define USE_WATT32
-	#endif
-
	#ifndef ARRAYSIZE
	#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
	#endif

src/tool_main.c+9 -0

@@ -63,6 +63,15 @@
	int vms_show = 0;
	#endif

+	#if defined(__AMIGA__)
+	#if defined(__GNUC__)
+	#define CURL_USED __attribute__((used))
+	#else
+	#define CURL_USED
+	#endif
+	static const char CURL_USED min_stack[] = "$STACK:16384";
+	#endif
+
	#ifdef __MINGW32__
	/*
	* There seems to be no way to escape "*" in command-line arguments with MinGW

src/tool_operate.c+1 -1

@@ -676,7 +676,7 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
	outs->bytes);
	fflush(outs->stream);
	/* truncate file at the position where we started appending */
-	#ifdef HAVE_FTRUNCATE
+	#if defined(HAVE_FTRUNCATE) && !defined(__DJGPP__) && !defined(__AMIGA__)
	if(ftruncate(fileno(outs->stream), outs->init)) {
	/* when truncate fails, we cannot just append as then we will
	create something strange, bail out */

tests/data/test517+2 -2

@@ -35,8 +35,8 @@ nothing
	</stdout>

	# This test case previously tested an overflow case ("2094 Nov 6 =>
-	# 2147483647") for 32bit time_t, but since some systems have 64bit time_t and
-	# handles this (returning 3939840000), and some 64bit-time_t systems don't
+	# 2147483647") for 32-bit time_t, but since some systems have 64-bit time_t and
+	# handles this (returning 3939840000), and some 64-bit time_t systems don't
	# handle this and return -1 for this, it turned very tricky to write a fine
	# test case and thus it is now removed until we have a way to write test cases
	# for this kind of things.

tests/libtest/CMakeLists.txt+4 -3

@@ -22,7 +22,8 @@
	#
	###########################################################################

-	# Get 'LIBTESTPROGS', '*_SOURCES', 'TESTUTIL', 'TSTTRACE', 'WARNLESS', 'MULTIBYTE', 'TIMEDIFF', 'THREADS', 'FIRSTFILES' variables
+	# Get 'LIBTESTPROGS', '*_SOURCES', 'TESTUTIL', 'TSTTRACE', 'WARNLESS', 'MULTIBYTE', 'INET_PTON', 'TIMEDIFF', 'THREADS',
+	# 'FIRSTFILES' variables
	curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
	include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")

@@ -50,7 +51,7 @@ if(CURL_TEST_BUNDLES)
	list(APPEND libtests_SOURCES ${TESTUTIL} ${TSTTRACE})
	if(LIB_SELECTED STREQUAL LIB_SHARED)
	# These are part of the libcurl static lib. Add them here when linking shared.
-	list(APPEND libtests_SOURCES ${WARNLESS} ${MULTIBYTE} ${TIMEDIFF} ${THREADS})
+	list(APPEND libtests_SOURCES ${WARNLESS} ${MULTIBYTE} ${INET_PTON} ${TIMEDIFF} ${THREADS})
	endif()
	endif()

@@ -63,7 +64,7 @@ foreach(_target IN LISTS LIBTESTPROGS)

	if(LIB_SELECTED STREQUAL LIB_STATIC)
	# These are part of the libcurl static lib. Do not compile/link them again.
-	list(REMOVE_ITEM _sources ${WARNLESS} ${MULTIBYTE} ${TIMEDIFF} ${THREADS})
+	list(REMOVE_ITEM _sources ${WARNLESS} ${MULTIBYTE} ${INET_PTON} ${TIMEDIFF} ${THREADS})
	endif()

	string(TOUPPER ${_target} _upper_target)

tests/libtest/Makefile.am+1 -1

@@ -103,7 +103,7 @@ CLEANFILES += libtest_bundle.c
	if USE_CPPFLAG_CURL_STATICLIB
	else
	# These are part of the libcurl static lib. Add them here when linking shared.
-	libtests_SOURCES += $(WARNLESS) $(MULTIBYTE) $(TIMEDIFF) $(THREADS)
+	libtests_SOURCES += $(WARNLESS) $(MULTIBYTE) $(INET_PTON) $(TIMEDIFF) $(THREADS)
	endif
	else
	noinst_PROGRAMS = $(LIBTESTPROGS)

tests/libtest/Makefile.inc+4 -1

@@ -33,6 +33,9 @@ WARNLESS = ../../lib/warnless.c ../../lib/warnless.h
	# files used only in some libcurl test programs
	MULTIBYTE = ../../lib/curl_multibyte.c ../../lib/curl_multibyte.h

+	# files used only in some libcurl test programs
+	INET_PTON = ../../lib/inet_pton.c ../../lib/inet_pton.h
+
	# these files are used in every single test program below
	TIMEDIFF = ../../lib/timediff.c ../../lib/timediff.h
	FIRSTFILES = first.c first.h
@@ -641,7 +644,7 @@ lib1958_LDADD = $(TESTUTIL_LIBS)
	lib1959_SOURCES = lib1959.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
	lib1959_LDADD = $(TESTUTIL_LIBS)

-	lib1960_SOURCES = lib1960.c $(SUPPORTFILES)
+	lib1960_SOURCES = lib1960.c $(SUPPORTFILES) $(INET_PTON)
	lib1960_LDADD = $(TESTUTIL_LIBS)

	lib1964_SOURCES = lib1964.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)

tests/libtest/lib1531.c+2 -1

@@ -115,7 +115,8 @@ CURLcode test(char *URL)
	rc = 0;
	#else
	/* Portable sleep for platforms other than Windows. */
-	struct timeval wait = { 0, 100 * 1000 }; /* 100ms */
+	struct timeval wait = {0};
+	wait.tv_usec = 100 * 1000; /* 100ms */
	rc = select(0, NULL, NULL, NULL, &wait);
	#endif
	}

tests/libtest/lib1960.c+2 -21

@@ -23,18 +23,7 @@
	***************************************************************************/
	#include "test.h"

-	#ifdef HAVE_INET_PTON
-
-	#ifdef HAVE_NETINET_IN_H
-	#include <netinet/in.h>
-	#endif
-	#ifdef HAVE_SYS_SOCKET_H
-	#include <sys/socket.h>
-	#endif
-	#ifdef HAVE_ARPA_INET_H
-	#include <arpa/inet.h>
-	#endif
-
+	#include "inet_pton.h"
	#include "memdebug.h"

	/* to prevent libcurl from closing our socket */
@@ -101,7 +90,7 @@ CURLcode test(char *URL)
	serv_addr.sin_family = AF_INET;
	serv_addr.sin_port = htons(port);

-	if(inet_pton(AF_INET, libtest_arg2, &serv_addr.sin_addr) <= 0) {
+	if(Curl_inet_pton(AF_INET, libtest_arg2, &serv_addr.sin_addr) <= 0) {
	fprintf(stderr, "inet_pton failed\n");
	goto test_cleanup;
	}
@@ -139,11 +128,3 @@ test_cleanup:

	return res;
	}
-	#else
-	CURLcode test(char *URL)
-	{
-	(void)URL;
-	printf("lacks inet_pton\n");
-	return CURLE_OK;
-	}
-	#endif

tests/libtest/lib530.c+13 -4

@@ -218,7 +218,14 @@ static void updateFdSet(struct Sockets sockets, fd_set fdset,
	{
	int i;
	for(i = 0; i < sockets->count; ++i) {
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockets->sockets[i], fdset);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(*maxFd < sockets->sockets[i] + 1) {
	*maxFd = sockets->sockets[i] + 1;
	}
@@ -261,8 +268,9 @@ static CURLcode testone(char *URL, int timercb, int socketcb)
	CURLcode res = CURLE_OK;
	CURL curl = NULL; CURLM m = NULL;
	struct ReadWriteSockets sockets = {{NULL, 0, 0}, {NULL, 0, 0}};
-	struct timeval timeout = {-1, 0};
	int success = 0;
+	struct timeval timeout = {0};
+	timeout.tv_sec = (time_t)-1;

	/* set the limits */
	max_timer_calls = timercb;
@@ -303,14 +311,15 @@ static CURLcode testone(char *URL, int timercb, int socketcb)
	while(!checkForCompletion(m, &success)) {
	fd_set readSet, writeSet;
	curl_socket_t maxFd = 0;
-	struct timeval tv = {10, 0};
+	struct timeval tv = {0};
+	tv.tv_sec = 10;

	FD_ZERO(&readSet);
	FD_ZERO(&writeSet);
	updateFdSet(&sockets.read, &readSet, &maxFd);
	updateFdSet(&sockets.write, &writeSet, &maxFd);

-	if(timeout.tv_sec != -1) {
+	if(timeout.tv_sec != (time_t)-1) {
	int usTimeout = getMicroSecondTimeout(&timeout);
	tv.tv_sec = usTimeout / 1000000;
	tv.tv_usec = usTimeout % 1000000;
@@ -333,7 +342,7 @@ static CURLcode testone(char *URL, int timercb, int socketcb)
	goto test_cleanup;
	}

-	if(timeout.tv_sec != -1 && getMicroSecondTimeout(&timeout) == 0) {
+	if(timeout.tv_sec != (time_t)-1 && getMicroSecondTimeout(&timeout) == 0) {
	/* Curl's timer has elapsed. */
	if(socket_action(m, CURL_SOCKET_TIMEOUT, 0, "timeout")) {
	res = TEST_ERR_BAD_TIMEOUT;

tests/libtest/lib582.c+13 -4

@@ -186,7 +186,14 @@ static void updateFdSet(struct Sockets sockets, fd_set fdset,
	{
	int i;
	for(i = 0; i < sockets->count; ++i) {
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockets->sockets[i], fdset);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(*maxFd < sockets->sockets[i] + 1) {
	*maxFd = sockets->sockets[i] + 1;
	}
@@ -227,8 +234,9 @@ CURLcode test(char *URL)
	struct_stat file_info;
	CURLM *m = NULL;
	struct ReadWriteSockets sockets = {{NULL, 0, 0}, {NULL, 0, 0}};
-	struct timeval timeout = {-1, 0};
	int success = 0;
+	struct timeval timeout = {0};
+	timeout.tv_sec = (time_t)-1;

	assert(test_argc >= 5);

@@ -299,14 +307,15 @@ CURLcode test(char *URL)
	while(!checkForCompletion(m, &success)) {
	fd_set readSet, writeSet;
	curl_socket_t maxFd = 0;
-	struct timeval tv = {10, 0};
+	struct timeval tv = {0};
+	tv.tv_sec = 10;

	FD_ZERO(&readSet);
	FD_ZERO(&writeSet);
	updateFdSet(&sockets.read, &readSet, &maxFd);
	updateFdSet(&sockets.write, &writeSet, &maxFd);

-	if(timeout.tv_sec != -1) {
+	if(timeout.tv_sec != (time_t)-1) {
	int usTimeout = getMicroSecondTimeout(&timeout);
	tv.tv_sec = usTimeout / 1000000;
	tv.tv_usec = usTimeout % 1000000;
@@ -322,7 +331,7 @@ CURLcode test(char *URL)
	checkFdSet(m, &sockets.read, &readSet, CURL_CSELECT_IN, "read");
	checkFdSet(m, &sockets.write, &writeSet, CURL_CSELECT_OUT, "write");

-	if(timeout.tv_sec != -1 && getMicroSecondTimeout(&timeout) == 0) {
+	if(timeout.tv_sec != (time_t)-1 && getMicroSecondTimeout(&timeout) == 0) {
	/* Curl's timer has elapsed. */
	notifyCurl(m, CURL_SOCKET_TIMEOUT, 0, "timeout");
	}

tests/server/mqttd.c+7 -0

@@ -748,7 +748,14 @@ static bool incoming(curl_socket_t listenfd)
	FD_ZERO(&fds_err);

	/* there's always a socket to wait for */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockfd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif

	do {
	/* select() blocking behavior call on blocking descriptors please */

tests/server/resolve.c+4 -0

@@ -142,7 +142,11 @@ int main(int argc, char *argv[])
	/* gethostbyname() resolve */
	struct hostent *he;

+	#ifdef __AMIGA__
+	he = gethostbyname((unsigned char *)host);
+	#else
	he = gethostbyname(host);
+	#endif

	rc = !he;
	}

tests/server/sockfilt.c+28 -0

@@ -996,7 +996,14 @@ static bool juggle(curl_socket_t *sockfdp,
	FD_ZERO(&fds_write);
	FD_ZERO(&fds_err);

+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET((curl_socket_t)fileno(stdin), &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif

	switch(*mode) {

@@ -1005,7 +1012,14 @@ static bool juggle(curl_socket_t *sockfdp,
	/* server mode */
	sockfd = listenfd;
	/* there's always a socket to wait for */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockfd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	maxfd = (int)sockfd;
	break;

@@ -1019,7 +1033,14 @@ static bool juggle(curl_socket_t *sockfdp,
	}
	else {
	/* there's always a socket to wait for */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockfd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	maxfd = (int)sockfd;
	}
	break;
@@ -1029,7 +1050,14 @@ static bool juggle(curl_socket_t *sockfdp,
	sockfd = *sockfdp;
	/* sockfd turns CURL_SOCKET_BAD when our connection has been closed */
	if(CURL_SOCKET_BAD != sockfd) {
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockfd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	maxfd = (int)sockfd;
	}
	else {

tests/server/socksd.c+21 -0

@@ -717,16 +717,37 @@ static bool incoming(curl_socket_t listenfd)
	FD_ZERO(&fds_err);

	/* there's always a socket to wait for */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sockfd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif

	for(i = 0; i < 2; i++) {
	if(c[i].used) {
	curl_socket_t fd = c[i].clientfd;
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(fd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if((int)fd > maxfd)
	maxfd = (int)fd;
	fd = c[i].remotefd;
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(fd, &fds_read);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if((int)fd > maxfd)
	maxfd = (int)fd;
	}

tests/server/sws.c+64 -4

@@ -902,13 +902,21 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
	int rc;
	fd_set input;
	fd_set output;
-	struct timeval timeout = {1, 0}; /* 1000 ms */
+	struct timeval timeout = {0};
+	timeout.tv_sec = 1; /* 1000 ms */

	logmsg("Got EAGAIN from sread");
	FD_ZERO(&input);
	FD_ZERO(&output);
	got = 0;
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(sock, &input);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	do {
	logmsg("Wait until readable");
	rc = select((int)sock + 1, &input, &output, NULL, &timeout);
@@ -1375,10 +1383,18 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
	error = SOCKERRNO;
	if((error == EINPROGRESS) \|\| (error == EWOULDBLOCK)) {
	fd_set output;
-	struct timeval timeout = {1, 0}; /* 1000 ms */
+	struct timeval timeout = {0};
+	timeout.tv_sec = 1; /* 1000 ms */

	FD_ZERO(&output);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(serverfd, &output);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	while(1) {
	rc = select((int)serverfd + 1, NULL, &output, NULL, &timeout);
	if(rc < 0 && SOCKERRNO != EINTR)
@@ -1488,9 +1504,10 @@ static void http_connect(curl_socket_t *infdp,

	fd_set input;
	fd_set output;
-	struct timeval timeout = {1, 0}; /* 1000 ms */
	ssize_t rc;
	curl_socket_t maxfd = (curl_socket_t)-1;
+	struct timeval timeout = {0};
+	timeout.tv_sec = 1; /* 1000 ms */

	FD_ZERO(&input);
	FD_ZERO(&output);
@@ -1502,7 +1519,14 @@ static void http_connect(curl_socket_t *infdp,
	/* listener socket is monitored to allow client to establish
	secondary tunnel only when this tunnel is not established
	and primary one is fully operational */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(rootfd, &input);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	maxfd = rootfd;
	}

@@ -1512,14 +1536,28 @@ static void http_connect(curl_socket_t *infdp,
	if(clientfd[i] != CURL_SOCKET_BAD) {
	if(poll_client_rd[i]) {
	/* unless told not to do so, monitor readability */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(clientfd[i], &input);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(clientfd[i] > maxfd)
	maxfd = clientfd[i];
	}
	if(poll_client_wr[i] && toc[i]) {
	/* unless told not to do so, monitor writability
	if there is data ready to be sent to client */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(clientfd[i], &output);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(clientfd[i] > maxfd)
	maxfd = clientfd[i];
	}
@@ -1528,14 +1566,28 @@ static void http_connect(curl_socket_t *infdp,
	if(serverfd[i] != CURL_SOCKET_BAD) {
	if(poll_server_rd[i]) {
	/* unless told not to do so, monitor readability */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(serverfd[i], &input);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(serverfd[i] > maxfd)
	maxfd = serverfd[i];
	}
	if(poll_server_wr[i] && tos[i]) {
	/* unless told not to do so, monitor writability
	if there is data ready to be sent to server */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(serverfd[i], &output);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(serverfd[i] > maxfd)
	maxfd = serverfd[i];
	}
@@ -2323,9 +2375,10 @@ int main(int argc, char *argv[])
	for(;;) {
	fd_set input;
	fd_set output;
-	struct timeval timeout = {0, 250000L}; /* 250 ms */
	curl_socket_t maxfd = (curl_socket_t)-1;
	int active;
+	struct timeval timeout = {0};
+	timeout.tv_usec = 250000L; /* 250 ms */

	/* Clear out closed sockets */
	for(socket_idx = num_sockets - 1; socket_idx >= 1; --socket_idx) {
@@ -2347,7 +2400,14 @@ int main(int argc, char *argv[])

	for(socket_idx = 0; socket_idx < num_sockets; ++socket_idx) {
	/* Listen on all sockets */
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Warith-conversion"
+	#endif
	FD_SET(all_sockets[socket_idx], &input);
+	#if defined(__DJGPP__)
+	#pragma GCC diagnostic pop
+	#endif
	if(all_sockets[socket_idx] > maxfd)
	maxfd = all_sockets[socket_idx];
	}

tests/server/tftpd.c+6 -7

@@ -512,21 +512,20 @@ skipit:

	static int synchnet(curl_socket_t f /* socket to flush */)
	{
-
-	#if defined(HAVE_IOCTLSOCKET)
-	unsigned long i;
-	#else
-	int i;
-	#endif
	int j = 0;
	char rbuf[PKTSIZE];
	srvr_sockaddr_union_t fromaddr;
	curl_socklen_t fromaddrlen;

	for(;;) {
-	#if defined(HAVE_IOCTLSOCKET)
+	#if defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
+	long i;
+	(void) IoctlSocket(f, FIONBIO, &i);
+	#elif defined(HAVE_IOCTLSOCKET)
+	unsigned long i;
	(void) ioctlsocket(f, FIONREAD, &i);
	#else
+	int i;
	(void) ioctl(f, FIONREAD, &i);
	#endif
	if(i) {

tests/server/util.c+4 -0

@@ -40,6 +40,10 @@
	#include <sys/poll.h>
	#endif

+	#ifdef MSDOS
+	#include <dos.h> /* delay() */
+	#endif
+
	#include "curlx.h" /* from the private lib dir */
	#include "getpart.h"
	#include "util.h"

tests/unit/curlcheck.h+1 -1

@@ -84,7 +84,7 @@
	} \
	} while(0)

-	#define abort_test(msg) \
+	#define unittest_abort(msg) \
	do { \
	fprintf(stderr, "%s:%d test ABORTED: '%s'\n", \
	__FILE__, __LINE__, msg); \