89771d19d5
Viktor Szakats
2025-07-27
Subject
tidy-up: prefer `ifdef`/`ifndef` for single checks
Binary
Architecture & Compiler Flags
—
Build Log
$ git checkout -f 89771d19d58d16cfe6e1d7fda7acd65a0a316eba
Previous HEAD position was 2ec54556d4 scripts: enable strict warnings in Perl where missing, fix fallouts
HEAD is now at 89771d19d5 tidy-up: prefer `ifdef`/`ifndef` for single checks
$ 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/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curlx/.deps/
Removing lib/curlx/.dirstamp
Removing lib/curlx/libcurl_la-base64.lo
Removing lib/curlx/libcurl_la-base64.o
Removing lib/curlx/libcurl_la-dynbuf.lo
Removing lib/curlx/libcurl_la-dynbuf.o
Removing lib/curlx/libcurl_la-inet_ntop.lo
Removing lib/curlx/libcurl_la-inet_ntop.o
Removing lib/curlx/libcurl_la-inet_pton.lo
Removing lib/curlx/libcurl_la-inet_pton.o
Removing lib/curlx/libcurl_la-multibyte.lo
Removing lib/curlx/libcurl_la-multibyte.o
Removing lib/curlx/libcurl_la-nonblock.lo
Removing lib/curlx/libcurl_la-nonblock.o
Removing lib/curlx/libcurl_la-strparse.lo
Removing lib/curlx/libcurl_la-strparse.o
Removing lib/curlx/libcurl_la-timediff.lo
Removing lib/curlx/libcurl_la-timediff.o
Removing lib/curlx/libcurl_la-timeval.lo
Removing lib/curlx/libcurl_la-timeval.o
Removing lib/curlx/libcurl_la-version_win32.lo
Removing lib/curlx/libcurl_la-version_win32.o
Removing lib/curlx/libcurl_la-wait.lo
Removing lib/curlx/libcurl_la-wait.o
Removing lib/curlx/libcurl_la-warnless.lo
Removing lib/curlx/libcurl_la-warnless.o
Removing lib/curlx/libcurl_la-winapi.lo
Removing lib/curlx/libcurl_la-winapi.o
Removing lib/curlx/libcurlu_la-base64.lo
Removing lib/curlx/libcurlu_la-base64.o
Removing lib/curlx/libcurlu_la-dynbuf.lo
Removing lib/curlx/libcurlu_la-dynbuf.o
Removing lib/curlx/libcurlu_la-inet_ntop.lo
Removing lib/curlx/libcurlu_la-inet_ntop.o
Removing lib/curlx/libcurlu_la-inet_pton.lo
Removing lib/curlx/libcurlu_la-inet_pton.o
Removing lib/curlx/libcurlu_la-multibyte.lo
Removing lib/curlx/libcurlu_la-multibyte.o
Removing lib/curlx/libcurlu_la-nonblock.lo
Removing lib/curlx/libcurlu_la-nonblock.o
Removing lib/curlx/libcurlu_la-strparse.lo
Removing lib/curlx/libcurlu_la-strparse.o
Removing lib/curlx/libcurlu_la-timediff.lo
Removing lib/curlx/libcurlu_la-timediff.o
Removing lib/curlx/libcurlu_la-timeval.lo
Removing lib/curlx/libcurlu_la-timeval.o
Removing lib/curlx/libcurlu_la-version_win32.lo
Removing lib/curlx/libcurlu_la-version_win32.o
Removing lib/curlx/libcurlu_la-wait.lo
Removing lib/curlx/libcurlu_la-wait.o
Removing lib/curlx/libcurlu_la-warnless.lo
Removing lib/curlx/libcurlu_la-warnless.o
Removing lib/curlx/libcurlu_la-winapi.lo
Removing lib/curlx/libcurlu_la-winapi.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-base.lo
Removing lib/libcurl_la-asyn-base.o
Removing lib/libcurl_la-asyn-thrdd.lo
Removing lib/libcurl_la-asyn-thrdd.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-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-cshutdn.lo
Removing lib/libcurl_la-cshutdn.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_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-cw-pause.lo
Removing lib/libcurl_la-cw-pause.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.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-fake_addrinfo.lo
Removing lib/libcurl_la-fake_addrinfo.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-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-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-httpsrr.lo
Removing lib/libcurl_la-httpsrr.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-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-multi_ev.lo
Removing lib/libcurl_la-multi_ev.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.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-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.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-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-uint-bset.lo
Removing lib/libcurl_la-uint-bset.o
Removing lib/libcurl_la-uint-hash.lo
Removing lib/libcurl_la-uint-hash.o
Removing lib/libcurl_la-uint-spbset.lo
Removing lib/libcurl_la-uint-spbset.o
Removing lib/libcurl_la-uint-table.lo
Removing lib/libcurl_la-uint-table.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-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/libcurlu.la
Removing lib/libcurlu_la-altsvc.lo
Removing lib/libcurlu_la-altsvc.o
Removing lib/libcurlu_la-amigaos.lo
Removing lib/libcurlu_la-amigaos.o
Removing lib/libcurlu_la-asyn-ares.lo
Removing lib/libcurlu_la-asyn-ares.o
Removing lib/libcurlu_la-asyn-base.lo
Removing lib/libcurlu_la-asyn-base.o
Removing lib/libcurlu_la-asyn-thrdd.lo
Removing lib/libcurlu_la-asyn-thrdd.o
Removing lib/libcurlu_la-bufq.lo
Removing lib/libcurlu_la-bufq.o
Removing lib/libcurlu_la-bufref.lo
Removing lib/libcurlu_la-bufref.o
Removing lib/libcurlu_la-cf-h1-proxy.lo
Removing lib/libcurlu_la-cf-h1-proxy.o
Removing lib/libcurlu_la-cf-h2-proxy.lo
Removing lib/libcurlu_la-cf-h2-proxy.o
Removing lib/libcurlu_la-cf-haproxy.lo
Removing lib/libcurlu_la-cf-haproxy.o
Removing lib/libcurlu_la-cf-https-connect.lo
Removing lib/libcurlu_la-cf-https-connect.o
Removing lib/libcurlu_la-cf-socket.lo
Removing lib/libcurlu_la-cf-socket.o
Removing lib/libcurlu_la-cfilters.lo
Removing lib/libcurlu_la-cfilters.o
Removing lib/libcurlu_la-conncache.lo
Removing lib/libcurlu_la-conncache.o
Removing lib/libcurlu_la-connect.lo
Removing lib/libcurlu_la-connect.o
Removing lib/libcurlu_la-content_encoding.lo
Removing lib/libcurlu_la-content_encoding.o
Removing lib/libcurlu_la-cookie.lo
Removing lib/libcurlu_la-cookie.o
Removing lib/libcurlu_la-cshutdn.lo
Removing lib/libcurlu_la-cshutdn.o
Removing lib/libcurlu_la-curl_addrinfo.lo
Removing lib/libcurlu_la-curl_addrinfo.o
Removing lib/libcurlu_la-curl_des.lo
Removing lib/libcurlu_la-curl_des.o
Removing lib/libcurlu_la-curl_endian.lo
Removing lib/libcurlu_la-curl_endian.o
Removing lib/libcurlu_la-curl_fnmatch.lo
Removing lib/libcurlu_la-curl_fnmatch.o
Removing lib/libcurlu_la-curl_get_line.lo
Removing lib/libcurlu_la-curl_get_line.o
Removing lib/libcurlu_la-curl_gethostname.lo
Removing lib/libcurlu_la-curl_gethostname.o
Removing lib/libcurlu_la-curl_gssapi.lo
Removing lib/libcurlu_la-curl_gssapi.o
Removing lib/libcurlu_la-curl_memrchr.lo
Removing lib/libcurlu_la-curl_memrchr.o
Removing lib/libcurlu_la-curl_ntlm_core.lo
Removing lib/libcurlu_la-curl_ntlm_core.o
Removing lib/libcurlu_la-curl_range.lo
Removing lib/libcurlu_la-curl_range.o
Removing lib/libcurlu_la-curl_rtmp.lo
Removing lib/libcurlu_la-curl_rtmp.o
Removing lib/libcurlu_la-curl_sasl.lo
Removing lib/libcurlu_la-curl_sasl.o
Removing lib/libcurlu_la-curl_sha512_256.lo
Removing lib/libcurlu_la-curl_sha512_256.o
Removing lib/libcurlu_la-curl_sspi.lo
Removing lib/libcurlu_la-curl_sspi.o
Removing lib/libcurlu_la-curl_threads.lo
Removing lib/libcurlu_la-curl_threads.o
Removing lib/libcurlu_la-curl_trc.lo
Removing lib/libcurlu_la-curl_trc.o
Removing lib/libcurlu_la-cw-out.lo
Removing lib/libcurlu_la-cw-out.o
Removing lib/libcurlu_la-cw-pause.lo
Removing lib/libcurlu_la-cw-pause.o
Removing lib/libcurlu_la-dict.lo
Removing lib/libcurlu_la-dict.o
Removing lib/libcurlu_la-doh.lo
Removing lib/libcurlu_la-doh.o
Removing lib/libcurlu_la-dynhds.lo
Removing lib/libcurlu_la-dynhds.o
Removing lib/libcurlu_la-easy.lo
Removing lib/libcurlu_la-easy.o
Removing lib/libcurlu_la-easygetopt.lo
Removing lib/libcurlu_la-easygetopt.o
Removing lib/libcurlu_la-easyoptions.lo
Removing lib/libcurlu_la-easyoptions.o
Removing lib/libcurlu_la-escape.lo
Removing lib/libcurlu_la-escape.o
Removing lib/libcurlu_la-fake_addrinfo.lo
Removing lib/libcurlu_la-fake_addrinfo.o
Removing lib/libcurlu_la-file.lo
Removing lib/libcurlu_la-file.o
Removing lib/libcurlu_la-fileinfo.lo
Removing lib/libcurlu_la-fileinfo.o
Removing lib/libcurlu_la-fopen.lo
Removing lib/libcurlu_la-fopen.o
Removing lib/libcurlu_la-formdata.lo
Removing lib/libcurlu_la-formdata.o
Removing lib/libcurlu_la-ftp.lo
Removing lib/libcurlu_la-ftp.o
Removing lib/libcurlu_la-ftplistparser.lo
Removing lib/libcurlu_la-ftplistparser.o
Removing lib/libcurlu_la-getenv.lo
Removing lib/libcurlu_la-getenv.o
Removing lib/libcurlu_la-getinfo.lo
Removing lib/libcurlu_la-getinfo.o
Removing lib/libcurlu_la-gopher.lo
Removing lib/libcurlu_la-gopher.o
Removing lib/libcurlu_la-hash.lo
Removing lib/libcurlu_la-hash.o
Removing lib/libcurlu_la-headers.lo
Removing lib/libcurlu_la-headers.o
Removing lib/libcurlu_la-hmac.lo
Removing lib/libcurlu_la-hmac.o
Removing lib/libcurlu_la-hostip.lo
Removing lib/libcurlu_la-hostip.o
Removing lib/libcurlu_la-hostip4.lo
Removing lib/libcurlu_la-hostip4.o
Removing lib/libcurlu_la-hostip6.lo
Removing lib/libcurlu_la-hostip6.o
Removing lib/libcurlu_la-hsts.lo
Removing lib/libcurlu_la-hsts.o
Removing lib/libcurlu_la-http.lo
Removing lib/libcurlu_la-http.o
Removing lib/libcurlu_la-http1.lo
Removing lib/libcurlu_la-http1.o
Removing lib/libcurlu_la-http2.lo
Removing lib/libcurlu_la-http2.o
Removing lib/libcurlu_la-http_aws_sigv4.lo
Removing lib/libcurlu_la-http_aws_sigv4.o
Removing lib/libcurlu_la-http_chunks.lo
Removing lib/libcurlu_la-http_chunks.o
Removing lib/libcurlu_la-http_digest.lo
Removing lib/libcurlu_la-http_digest.o
Removing lib/libcurlu_la-http_negotiate.lo
Removing lib/libcurlu_la-http_negotiate.o
Removing lib/libcurlu_la-http_ntlm.lo
Removing lib/libcurlu_la-http_ntlm.o
Removing lib/libcurlu_la-http_proxy.lo
Removing lib/libcurlu_la-http_proxy.o
Removing lib/libcurlu_la-httpsrr.lo
Removing lib/libcurlu_la-httpsrr.o
Removing lib/libcurlu_la-idn.lo
Removing lib/libcurlu_la-idn.o
Removing lib/libcurlu_la-if2ip.lo
Removing lib/libcurlu_la-if2ip.o
Removing lib/libcurlu_la-imap.lo
Removing lib/libcurlu_la-imap.o
Removing lib/libcurlu_la-krb5.lo
Removing lib/libcurlu_la-krb5.o
Removing lib/libcurlu_la-ldap.lo
Removing lib/libcurlu_la-ldap.o
Removing lib/libcurlu_la-llist.lo
Removing lib/libcurlu_la-llist.o
Removing lib/libcurlu_la-macos.lo
Removing lib/libcurlu_la-macos.o
Removing lib/libcurlu_la-md4.lo
Removing lib/libcurlu_la-md4.o
Removing lib/libcurlu_la-md5.lo
Removing lib/libcurlu_la-md5.o
Removing lib/libcurlu_la-memdebug.lo
Removing lib/libcurlu_la-memdebug.o
Removing lib/libcurlu_la-mime.lo
Removing lib/libcurlu_la-mime.o
Removing lib/libcurlu_la-mprintf.lo
Removing lib/libcurlu_la-mprintf.o
Removing lib/libcurlu_la-mqtt.lo
Removing lib/libcurlu_la-mqtt.o
Removing lib/libcurlu_la-multi.lo
Removing lib/libcurlu_la-multi.o
Removing lib/libcurlu_la-multi_ev.lo
Removing lib/libcurlu_la-multi_ev.o
Removing lib/libcurlu_la-netrc.lo
Removing lib/libcurlu_la-netrc.o
Removing lib/libcurlu_la-noproxy.lo
Removing lib/libcurlu_la-noproxy.o
Removing lib/libcurlu_la-openldap.lo
Removing lib/libcurlu_la-openldap.o
Removing lib/libcurlu_la-parsedate.lo
Removing lib/libcurlu_la-parsedate.o
Removing lib/libcurlu_la-pingpong.lo
Removing lib/libcurlu_la-pingpong.o
Removing lib/libcurlu_la-pop3.lo
Removing lib/libcurlu_la-pop3.o
Removing lib/libcurlu_la-progress.lo
Removing lib/libcurlu_la-progress.o
Removing lib/libcurlu_la-psl.lo
Removing lib/libcurlu_la-psl.o
Removing lib/libcurlu_la-rand.lo
Removing lib/libcurlu_la-rand.o
Removing lib/libcurlu_la-rename.lo
Removing lib/libcurlu_la-rename.o
Removing lib/libcurlu_la-request.lo
Removing lib/libcurlu_la-request.o
Removing lib/libcurlu_la-rtsp.lo
Removing lib/libcurlu_la-rtsp.o
Removing lib/libcurlu_la-select.lo
Removing lib/libcurlu_la-select.o
Removing lib/libcurlu_la-sendf.lo
Removing lib/libcurlu_la-sendf.o
Removing lib/libcurlu_la-setopt.lo
Removing lib/libcurlu_la-setopt.o
Removing lib/libcurlu_la-sha256.lo
Removing lib/libcurlu_la-sha256.o
Removing lib/libcurlu_la-share.lo
Removing lib/libcurlu_la-share.o
Removing lib/libcurlu_la-slist.lo
Removing lib/libcurlu_la-slist.o
Removing lib/libcurlu_la-smb.lo
Removing lib/libcurlu_la-smb.o
Removing lib/libcurlu_la-smtp.lo
Removing lib/libcurlu_la-smtp.o
Removing lib/libcurlu_la-socketpair.lo
Removing lib/libcurlu_la-socketpair.o
Removing lib/libcurlu_la-socks.lo
Removing lib/libcurlu_la-socks.o
Removing lib/libcurlu_la-socks_gssapi.lo
Removing lib/libcurlu_la-socks_gssapi.o
Removing lib/libcurlu_la-socks_sspi.lo
Removing lib/libcurlu_la-socks_sspi.o
Removing lib/libcurlu_la-speedcheck.lo
Removing lib/libcurlu_la-speedcheck.o
Removing lib/libcurlu_la-splay.lo
Removing lib/libcurlu_la-splay.o
Removing lib/libcurlu_la-strcase.lo
Removing lib/libcurlu_la-strcase.o
Removing lib/libcurlu_la-strdup.lo
Removing lib/libcurlu_la-strdup.o
Removing lib/libcurlu_la-strequal.lo
Removing lib/libcurlu_la-strequal.o
Removing lib/libcurlu_la-strerror.lo
Removing lib/libcurlu_la-strerror.o
Removing lib/libcurlu_la-system_win32.lo
Removing lib/libcurlu_la-system_win32.o
Removing lib/libcurlu_la-telnet.lo
Removing lib/libcurlu_la-telnet.o
Removing lib/libcurlu_la-tftp.lo
Removing lib/libcurlu_la-tftp.o
Removing lib/libcurlu_la-transfer.lo
Removing lib/libcurlu_la-transfer.o
Removing lib/libcurlu_la-uint-bset.lo
Removing lib/libcurlu_la-uint-bset.o
Removing lib/libcurlu_la-uint-hash.lo
Removing lib/libcurlu_la-uint-hash.o
Removing lib/libcurlu_la-uint-spbset.lo
Removing lib/libcurlu_la-uint-spbset.o
Removing lib/libcurlu_la-uint-table.lo
Removing lib/libcurlu_la-uint-table.o
Removing lib/libcurlu_la-url.lo
Removing lib/libcurlu_la-url.o
Removing lib/libcurlu_la-urlapi.lo
Removing lib/libcurlu_la-urlapi.o
Removing lib/libcurlu_la-version.lo
Removing lib/libcurlu_la-version.o
Removing lib/libcurlu_la-ws.lo
Removing lib/libcurlu_la-ws.o
Removing lib/stamp-h1
Removing lib/unitprotos.h
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/vauth/libcurlu_la-cleartext.lo
Removing lib/vauth/libcurlu_la-cleartext.o
Removing lib/vauth/libcurlu_la-cram.lo
Removing lib/vauth/libcurlu_la-cram.o
Removing lib/vauth/libcurlu_la-digest.lo
Removing lib/vauth/libcurlu_la-digest.o
Removing lib/vauth/libcurlu_la-digest_sspi.lo
Removing lib/vauth/libcurlu_la-digest_sspi.o
Removing lib/vauth/libcurlu_la-gsasl.lo
Removing lib/vauth/libcurlu_la-gsasl.o
Removing lib/vauth/libcurlu_la-krb5_gssapi.lo
Removing lib/vauth/libcurlu_la-krb5_gssapi.o
Removing lib/vauth/libcurlu_la-krb5_sspi.lo
Removing lib/vauth/libcurlu_la-krb5_sspi.o
Removing lib/vauth/libcurlu_la-ntlm.lo
Removing lib/vauth/libcurlu_la-ntlm.o
Removing lib/vauth/libcurlu_la-ntlm_sspi.lo
Removing lib/vauth/libcurlu_la-ntlm_sspi.o
Removing lib/vauth/libcurlu_la-oauth2.lo
Removing lib/vauth/libcurlu_la-oauth2.o
Removing lib/vauth/libcurlu_la-spnego_gssapi.lo
Removing lib/vauth/libcurlu_la-spnego_gssapi.o
Removing lib/vauth/libcurlu_la-spnego_sspi.lo
Removing lib/vauth/libcurlu_la-spnego_sspi.o
Removing lib/vauth/libcurlu_la-vauth.lo
Removing lib/vauth/libcurlu_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
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/vquic/libcurlu_la-curl_ngtcp2.lo
Removing lib/vquic/libcurlu_la-curl_ngtcp2.o
Removing lib/vquic/libcurlu_la-curl_osslq.lo
Removing lib/vquic/libcurlu_la-curl_osslq.o
Removing lib/vquic/libcurlu_la-curl_quiche.lo
Removing lib/vquic/libcurlu_la-curl_quiche.o
Removing lib/vquic/libcurlu_la-vquic-tls.lo
Removing lib/vquic/libcurlu_la-vquic-tls.o
Removing lib/vquic/libcurlu_la-vquic.lo
Removing lib/vquic/libcurlu_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/vssh/libcurlu_la-curl_path.lo
Removing lib/vssh/libcurlu_la-curl_path.o
Removing lib/vssh/libcurlu_la-libssh.lo
Removing lib/vssh/libcurlu_la-libssh.o
Removing lib/vssh/libcurlu_la-libssh2.lo
Removing lib/vssh/libcurlu_la-libssh2.o
Removing lib/vssh/libcurlu_la-wolfssh.lo
Removing lib/vssh/libcurlu_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
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-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.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/vtls/libcurlu_la-cipher_suite.lo
Removing lib/vtls/libcurlu_la-cipher_suite.o
Removing lib/vtls/libcurlu_la-gtls.lo
Removing lib/vtls/libcurlu_la-gtls.o
Removing lib/vtls/libcurlu_la-hostcheck.lo
Removing lib/vtls/libcurlu_la-hostcheck.o
Removing lib/vtls/libcurlu_la-keylog.lo
Removing lib/vtls/libcurlu_la-keylog.o
Removing lib/vtls/libcurlu_la-mbedtls.lo
Removing lib/vtls/libcurlu_la-mbedtls.o
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.o
Removing lib/vtls/libcurlu_la-openssl.lo
Removing lib/vtls/libcurlu_la-openssl.o
Removing lib/vtls/libcurlu_la-rustls.lo
Removing lib/vtls/libcurlu_la-rustls.o
Removing lib/vtls/libcurlu_la-schannel.lo
Removing lib/vtls/libcurlu_la-schannel.o
Removing lib/vtls/libcurlu_la-schannel_verify.lo
Removing lib/vtls/libcurlu_la-schannel_verify.o
Removing lib/vtls/libcurlu_la-vtls.lo
Removing lib/vtls/libcurlu_la-vtls.o
Removing lib/vtls/libcurlu_la-vtls_scache.lo
Removing lib/vtls/libcurlu_la-vtls_scache.o
Removing lib/vtls/libcurlu_la-vtls_spack.lo
Removing lib/vtls/libcurlu_la-vtls_spack.o
Removing lib/vtls/libcurlu_la-wolfssl.lo
Removing lib/vtls/libcurlu_la-wolfssl.o
Removing lib/vtls/libcurlu_la-x509asn1.lo
Removing lib/vtls/libcurlu_la-x509asn1.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/curl-config2setopts.o
Removing src/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/curlinfo
Removing src/curlinfo.o
Removing src/libcurltool.la
Removing src/libcurltool_la-config2setopts.lo
Removing src/libcurltool_la-config2setopts.o
Removing src/libcurltool_la-slist_wc.lo
Removing src/libcurltool_la-slist_wc.o
Removing src/libcurltool_la-terminal.lo
Removing src/libcurltool_la-terminal.o
Removing src/libcurltool_la-tool_bname.lo
Removing src/libcurltool_la-tool_bname.o
Removing src/libcurltool_la-tool_cb_dbg.lo
Removing src/libcurltool_la-tool_cb_dbg.o
Removing src/libcurltool_la-tool_cb_hdr.lo
Removing src/libcurltool_la-tool_cb_hdr.o
Removing src/libcurltool_la-tool_cb_prg.lo
Removing src/libcurltool_la-tool_cb_prg.o
Removing src/libcurltool_la-tool_cb_rea.lo
Removing src/libcurltool_la-tool_cb_rea.o
Removing src/libcurltool_la-tool_cb_see.lo
Removing src/libcurltool_la-tool_cb_see.o
Removing src/libcurltool_la-tool_cb_soc.lo
Removing src/libcurltool_la-tool_cb_soc.o
Removing src/libcurltool_la-tool_cb_wrt.lo
Removing src/libcurltool_la-tool_cb_wrt.o
Removing src/libcurltool_la-tool_cfgable.lo
Removing src/libcurltool_la-tool_cfgable.o
Removing src/libcurltool_la-tool_dirhie.lo
Removing src/libcurltool_la-tool_dirhie.o
Removing src/libcurltool_la-tool_doswin.lo
Removing src/libcurltool_la-tool_doswin.o
Removing src/libcurltool_la-tool_easysrc.lo
Removing src/libcurltool_la-tool_easysrc.o
Removing src/libcurltool_la-tool_filetime.lo
Removing src/libcurltool_la-tool_filetime.o
Removing src/libcurltool_la-tool_findfile.lo
Removing src/libcurltool_la-tool_findfile.o
Removing src/libcurltool_la-tool_formparse.lo
Removing src/libcurltool_la-tool_formparse.o
Removing src/libcurltool_la-tool_getparam.lo
Removing src/libcurltool_la-tool_getparam.o
Removing src/libcurltool_la-tool_getpass.lo
Removing src/libcurltool_la-tool_getpass.o
Removing src/libcurltool_la-tool_help.lo
Removing src/libcurltool_la-tool_help.o
Removing src/libcurltool_la-tool_helpers.lo
Removing src/libcurltool_la-tool_helpers.o
Removing src/libcurltool_la-tool_ipfs.lo
Removing src/libcurltool_la-tool_ipfs.o
Removing src/libcurltool_la-tool_libinfo.lo
Removing src/libcurltool_la-tool_libinfo.o
Removing src/libcurltool_la-tool_listhelp.lo
Removing src/libcurltool_la-tool_listhelp.o
Removing src/libcurltool_la-tool_main.lo
Removing src/libcurltool_la-tool_main.o
Removing src/libcurltool_la-tool_msgs.lo
Removing src/libcurltool_la-tool_msgs.o
Removing src/libcurltool_la-tool_operate.lo
Removing src/libcurltool_la-tool_operate.o
Removing src/libcurltool_la-tool_operhlp.lo
Removing src/libcurltool_la-tool_operhlp.o
Removing src/libcurltool_la-tool_paramhlp.lo
Removing src/libcurltool_la-tool_paramhlp.o
Removing src/libcurltool_la-tool_parsecfg.lo
Removing src/libcurltool_la-tool_parsecfg.o
Removing src/libcurltool_la-tool_progress.lo
Removing src/libcurltool_la-tool_progress.o
Removing src/libcurltool_la-tool_setopt.lo
Removing src/libcurltool_la-tool_setopt.o
Removing src/libcurltool_la-tool_ssls.lo
Removing src/libcurltool_la-tool_ssls.o
Removing src/libcurltool_la-tool_stderr.lo
Removing src/libcurltool_la-tool_stderr.o
Removing src/libcurltool_la-tool_strdup.lo
Removing src/libcurltool_la-tool_strdup.o
Removing src/libcurltool_la-tool_urlglob.lo
Removing src/libcurltool_la-tool_urlglob.o
Removing src/libcurltool_la-tool_util.lo
Removing src/libcurltool_la-tool_util.o
Removing src/libcurltool_la-tool_vms.lo
Removing src/libcurltool_la-tool_vms.o
Removing src/libcurltool_la-tool_writeout.lo
Removing src/libcurltool_la-tool_writeout.o
Removing src/libcurltool_la-tool_writeout_json.lo
Removing src/libcurltool_la-tool_writeout_json.o
Removing src/libcurltool_la-tool_xattr.lo
Removing src/libcurltool_la-tool_xattr.o
Removing src/libcurltool_la-var.lo
Removing src/libcurltool_la-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/client/.deps/
Removing tests/client/Makefile
Removing tests/client/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/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/tunit/.deps/
Removing tests/tunit/Makefile
Removing tests/tunit/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:128: installing './compile'
configure.ac:448: installing './config.guess'
configure.ac:448: installing './config.sub'
configure.ac:128: installing './install-sh'
configure.ac:134: 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 whether to enable SSL session export 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.16.0-DEV
checking for httpd... no
checking for apache2... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for sockd... no
checking for sockd... no
checking for nghttpx... no
checking for caddy... no
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 crypto API... no
checking whether to build libcurl and curl in "unity" mode... 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 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 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 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 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 lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
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/select.h... yes
checking for sys/ioctl.h... yes
checking for unistd.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/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 stdint.h... (cached) yes
checking for sys/filio.h... no
checking for sys/eventfd.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.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 struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for send... yes
checking for sys/types.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 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 for sys/types.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 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 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 unistd.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 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 for accept4... 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 mach_absolute_time... no
checking for pipe... yes
checking for pipe2... yes
checking for poll... yes
checking for sendmmsg... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for if_nametoindex... yes
checking for realpath... yes
checking for sched_yield... yes
checking for sys/types.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 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 stricmp can be linked... no
checking if stricmp might be used... no
checking for setmode... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
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 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 enable HTTPS-RR support... no
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/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/tunit/Makefile
config.status: creating tests/client/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/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.16.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,amissl,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)
ECH: no (--enable-ech)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
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: libgsasl was not found
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
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-base.lo
CC libcurl_la-asyn-thrdd.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.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-cshutdn.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.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_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-cw-pause.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.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-fake_addrinfo.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-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.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-httpsrr.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.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-multi_ev.lo
CC libcurl_la-netrc.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-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-transfer.lo
CC libcurl_la-uint-bset.lo
CC libcurl_la-uint-hash.lo
CC libcurl_la-uint-spbset.lo
CC libcurl_la-uint-table.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-ws.lo
CC libcurlu_la-altsvc.lo
CC libcurlu_la-asyn-ares.lo
CC libcurlu_la-amigaos.lo
CC libcurlu_la-asyn-base.lo
CC libcurlu_la-asyn-thrdd.lo
CC libcurlu_la-bufq.lo
CC libcurlu_la-bufref.lo
CC libcurlu_la-cf-h1-proxy.lo
CC libcurlu_la-cf-h2-proxy.lo
CC libcurlu_la-cf-haproxy.lo
CC libcurlu_la-cf-https-connect.lo
CC libcurlu_la-cf-socket.lo
CC libcurlu_la-cfilters.lo
CC libcurlu_la-conncache.lo
CC libcurlu_la-connect.lo
CC libcurlu_la-content_encoding.lo
CC libcurlu_la-cookie.lo
CC libcurlu_la-cshutdn.lo
CC libcurlu_la-curl_addrinfo.lo
CC libcurlu_la-curl_des.lo
CC libcurlu_la-curl_endian.lo
CC libcurlu_la-curl_fnmatch.lo
CC libcurlu_la-curl_get_line.lo
CC libcurlu_la-curl_gethostname.lo
CC libcurlu_la-curl_gssapi.lo
CC libcurlu_la-curl_memrchr.lo
CC libcurlu_la-curl_ntlm_core.lo
CC libcurlu_la-curl_range.lo
CC libcurlu_la-curl_rtmp.lo
CC libcurlu_la-curl_sasl.lo
CC libcurlu_la-curl_sha512_256.lo
CC libcurlu_la-curl_sspi.lo
CC libcurlu_la-curl_threads.lo
CC libcurlu_la-curl_trc.lo
CC libcurlu_la-cw-out.lo
CC libcurlu_la-cw-pause.lo
CC libcurlu_la-dict.lo
CC libcurlu_la-doh.lo
CC libcurlu_la-dynhds.lo
CC libcurlu_la-easy.lo
CC libcurlu_la-easygetopt.lo
CC libcurlu_la-easyoptions.lo
CC libcurlu_la-escape.lo
CC libcurlu_la-fake_addrinfo.lo
CC libcurlu_la-file.lo
CC libcurlu_la-fileinfo.lo
CC libcurlu_la-fopen.lo
CC libcurlu_la-formdata.lo
CC libcurlu_la-ftp.lo
CC libcurlu_la-ftplistparser.lo
CC libcurlu_la-getenv.lo
CC libcurlu_la-getinfo.lo
CC libcurlu_la-gopher.lo
CC libcurlu_la-hash.lo
CC libcurlu_la-headers.lo
CC libcurlu_la-hmac.lo
CC libcurlu_la-hostip.lo
CC libcurlu_la-hostip4.lo
CC libcurlu_la-hostip6.lo
CC libcurlu_la-hsts.lo
CC libcurlu_la-http.lo
CC libcurlu_la-http1.lo
CC libcurlu_la-http2.lo
CC libcurlu_la-http_aws_sigv4.lo
CC libcurlu_la-http_chunks.lo
CC libcurlu_la-http_digest.lo
CC libcurlu_la-http_negotiate.lo
CC libcurlu_la-http_proxy.lo
CC libcurlu_la-http_ntlm.lo
CC libcurlu_la-httpsrr.lo
CC libcurlu_la-idn.lo
CC libcurlu_la-if2ip.lo
CC libcurlu_la-imap.lo
CC libcurlu_la-krb5.lo
CC libcurlu_la-ldap.lo
CC libcurlu_la-llist.lo
CC libcurlu_la-macos.lo
CC libcurlu_la-md4.lo
CC libcurlu_la-md5.lo
CC libcurlu_la-memdebug.lo
CC libcurlu_la-mime.lo
CC libcurlu_la-mprintf.lo
CC libcurlu_la-mqtt.lo
CC libcurlu_la-multi.lo
CC libcurlu_la-multi_ev.lo
CC libcurlu_la-netrc.lo
CC libcurlu_la-noproxy.lo
CC libcurlu_la-openldap.lo
CC libcurlu_la-parsedate.lo
CC libcurlu_la-pingpong.lo
CC libcurlu_la-pop3.lo
CC libcurlu_la-progress.lo
CC libcurlu_la-psl.lo
CC libcurlu_la-rand.lo
CC libcurlu_la-rename.lo
CC libcurlu_la-request.lo
CC libcurlu_la-rtsp.lo
CC libcurlu_la-select.lo
CC libcurlu_la-sendf.lo
CC libcurlu_la-setopt.lo
CC libcurlu_la-sha256.lo
CC libcurlu_la-share.lo
CC libcurlu_la-slist.lo
CC libcurlu_la-smb.lo
CC libcurlu_la-smtp.lo
CC libcurlu_la-socketpair.lo
CC libcurlu_la-socks.lo
CC libcurlu_la-socks_gssapi.lo
CC libcurlu_la-socks_sspi.lo
CC libcurlu_la-speedcheck.lo
CC libcurlu_la-splay.lo
CC libcurlu_la-strcase.lo
CC libcurlu_la-strdup.lo
CC libcurlu_la-strerror.lo
CC libcurlu_la-strequal.lo
CC libcurlu_la-system_win32.lo
CC libcurlu_la-telnet.lo
CC libcurlu_la-tftp.lo
CC libcurlu_la-transfer.lo
CC libcurlu_la-uint-bset.lo
CC libcurlu_la-uint-hash.lo
CC libcurlu_la-uint-spbset.lo
CC libcurlu_la-uint-table.lo
CC libcurlu_la-url.lo
CC libcurlu_la-urlapi.lo
CC libcurlu_la-version.lo
CC libcurlu_la-ws.lo
CC vauth/libcurlu_la-cleartext.lo
CC vauth/libcurlu_la-cram.lo
CC vauth/libcurlu_la-digest.lo
CC vauth/libcurlu_la-digest_sspi.lo
CC vauth/libcurlu_la-gsasl.lo
CC vauth/libcurlu_la-krb5_gssapi.lo
CC vauth/libcurlu_la-krb5_sspi.lo
CC vauth/libcurlu_la-ntlm.lo
CC vauth/libcurlu_la-ntlm_sspi.lo
CC vauth/libcurlu_la-oauth2.lo
CC vauth/libcurlu_la-spnego_gssapi.lo
CC vauth/libcurlu_la-spnego_sspi.lo
CC vauth/libcurlu_la-vauth.lo
CC vtls/libcurlu_la-cipher_suite.lo
CC vtls/libcurlu_la-gtls.lo
CC vtls/libcurlu_la-hostcheck.lo
CC vtls/libcurlu_la-keylog.lo
CC vtls/libcurlu_la-mbedtls.lo
CC vtls/libcurlu_la-mbedtls_threadlock.lo
CC vtls/libcurlu_la-openssl.lo
CC vtls/libcurlu_la-rustls.lo
CC vtls/libcurlu_la-schannel.lo
CC vtls/libcurlu_la-schannel_verify.lo
CC vtls/libcurlu_la-vtls.lo
CC vtls/libcurlu_la-vtls_scache.lo
CC vtls/libcurlu_la-vtls_spack.lo
CC vtls/libcurlu_la-wolfssl.lo
CC vtls/libcurlu_la-x509asn1.lo
CC vquic/libcurlu_la-curl_ngtcp2.lo
CC vquic/libcurlu_la-curl_quiche.lo
CC vquic/libcurlu_la-curl_osslq.lo
CC vquic/libcurlu_la-vquic.lo
CC vquic/libcurlu_la-vquic-tls.lo
CC vssh/libcurlu_la-libssh.lo
CC vssh/libcurlu_la-libssh2.lo
CC vssh/libcurlu_la-curl_path.lo
CC vssh/libcurlu_la-wolfssh.lo
CC curlx/libcurlu_la-base64.lo
CC curlx/libcurlu_la-dynbuf.lo
CC curlx/libcurlu_la-inet_ntop.lo
CC curlx/libcurlu_la-inet_pton.lo
CC curlx/libcurlu_la-multibyte.lo
CC curlx/libcurlu_la-nonblock.lo
CC curlx/libcurlu_la-strparse.lo
CC curlx/libcurlu_la-timediff.lo
CC curlx/libcurlu_la-timeval.lo
CC curlx/libcurlu_la-version_win32.lo
CC curlx/libcurlu_la-warnless.lo
CC curlx/libcurlu_la-wait.lo
CC curlx/libcurlu_la-winapi.lo
UNITPR unitprotos.h
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-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-vtls.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.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
CC curlx/libcurl_la-base64.lo
CC curlx/libcurl_la-dynbuf.lo
CC curlx/libcurl_la-inet_ntop.lo
CC curlx/libcurl_la-inet_pton.lo
CC curlx/libcurl_la-multibyte.lo
CC curlx/libcurl_la-nonblock.lo
CC curlx/libcurl_la-strparse.lo
CC curlx/libcurl_la-timediff.lo
CC curlx/libcurl_la-timeval.lo
CC curlx/libcurl_la-version_win32.lo
CC curlx/libcurl_la-wait.lo
CC curlx/libcurl_la-warnless.lo
CC curlx/libcurl_la-winapi.lo
CCLD libcurlu.la
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 curl-config2setopts.o
CC curl-slist_wc.o
CC curl-terminal.o
CC curl-tool_bname.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_see.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_ipfs.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_msgs.o
CC curl-tool_main.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_ssls.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_writeout_json.o
CC curl-var.o
CC curl-tool_xattr.o
echo '/* !checksrc! disable COPYRIGHT all */' > tool_hugehelp.c; \
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
echo '/* !checksrc! disable COPYRIGHT all */' > tool_ca_embed.c
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' >> tool_ca_embed.c
CC curlinfo.o
CC libcurltool_la-slist_wc.lo
CC libcurltool_la-config2setopts.lo
CC libcurltool_la-terminal.lo
CC libcurltool_la-tool_bname.lo
CC libcurltool_la-tool_cb_dbg.lo
CC libcurltool_la-tool_cb_hdr.lo
CC libcurltool_la-tool_cb_prg.lo
CC libcurltool_la-tool_cb_rea.lo
CC libcurltool_la-tool_cb_see.lo
CC libcurltool_la-tool_cb_soc.lo
CC libcurltool_la-tool_cb_wrt.lo
CC libcurltool_la-tool_cfgable.lo
CC libcurltool_la-tool_dirhie.lo
CC libcurltool_la-tool_doswin.lo
CC libcurltool_la-tool_easysrc.lo
CC libcurltool_la-tool_filetime.lo
CC libcurltool_la-tool_findfile.lo
CC libcurltool_la-tool_formparse.lo
CC libcurltool_la-tool_getparam.lo
CC libcurltool_la-tool_getpass.lo
CC libcurltool_la-tool_help.lo
CC libcurltool_la-tool_helpers.lo
CC libcurltool_la-tool_ipfs.lo
CC libcurltool_la-tool_libinfo.lo
CC libcurltool_la-tool_listhelp.lo
CC libcurltool_la-tool_main.lo
CC libcurltool_la-tool_msgs.lo
CC libcurltool_la-tool_operate.lo
CC libcurltool_la-tool_operhlp.lo
CC libcurltool_la-tool_paramhlp.lo
CC libcurltool_la-tool_parsecfg.lo
CC libcurltool_la-tool_progress.lo
CC libcurltool_la-tool_setopt.lo
CC libcurltool_la-tool_ssls.lo
CC libcurltool_la-tool_stderr.lo
CC libcurltool_la-tool_strdup.lo
CC libcurltool_la-tool_urlglob.lo
CC libcurltool_la-tool_util.lo
CC libcurltool_la-tool_vms.lo
CC libcurltool_la-tool_writeout.lo
CC libcurltool_la-tool_writeout_json.lo
CC libcurltool_la-tool_xattr.lo
CC libcurltool_la-var.lo
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.o
CCLD curlinfo
CCLD libcurltool.la
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 →
include/curl/curl.h +3 -3include/curl/easy.h +2 -2include/curl/header.h +1 -1include/curl/mprintf.h +3 -3include/curl/multi.h +1 -1include/curl/options.h +1 -1include/curl/system.h +9 -9include/curl/urlapi.h +1 -1include/curl/websockets.h +2 -2lib/asyn.h +1 -1lib/cf-h2-proxy.h +1 -2lib/cf-haproxy.c +1 -1lib/cf-haproxy.h +1 -1lib/cf-https-connect.c +2 -2lib/cf-https-connect.h +2 -2lib/cf-socket.c +8 -8lib/connect.c +4 -4lib/cshutdn.c +2 -2lib/curl_addrinfo.c +3 -3lib/curl_gssapi.c +1 -1lib/curl_md4.h +2 -2lib/curl_ntlm_core.c +15 -15lib/curl_ntlm_core.h +2 -2lib/curl_sasl.c +2 -2lib/curl_setup.h +6 -6lib/curl_sha512_256.c +3 -3lib/curl_threads.c +2 -2lib/curl_threads.h +1 -1lib/curl_trc.c +6 -6lib/curl_trc.h +2 -2lib/curlx/nonblock.c +1 -1lib/curlx/wait.c +1 -1lib/easy.c +2 -4lib/easy_lock.h +1 -1lib/file.c +1 -1lib/fileinfo.c +3 -0lib/fopen.c +1 -1lib/ftp.c +1 -1lib/hostip.c +2 -2lib/hostip4.c +4 -6lib/hostip6.c +1 -1lib/http.c +7 -7lib/http.h +1 -1lib/http2.c +3 -3lib/http_aws_sigv4.c +1 -1lib/http_digest.c +1 -1lib/http_ntlm.c +1 -1lib/httpsrr.h +1 -1lib/idn.c +1 -1lib/if2ip.c +1 -1lib/ldap.c +23 -23lib/md4.c +2 -2lib/md5.c +4 -4lib/multi.c +4 -4lib/multihandle.h +1 -1lib/rand.c +3 -3lib/rtsp.c +1 -1lib/setopt.c +3 -3lib/sha256.c +4 -4lib/smb.c +1 -2lib/smb.h +2 -3lib/socks.c +1 -1lib/url.c +4 -4lib/url.h +1 -1lib/urldata.h +5 -5lib/vauth/digest_sspi.c +4 -4lib/vauth/krb5_sspi.c +1 -1lib/vauth/ntlm.c +2 -2lib/vauth/ntlm_sspi.c +2 -2lib/vauth/spnego_sspi.c +1 -1lib/vauth/vauth.c +1 -1lib/vauth/vauth.h +7 -7lib/version.c +5 -5lib/vquic/curl_osslq.c +4 -4lib/vquic/vquic.c +1 -1lib/vssh/curl_path.c +1 -1lib/vssh/ssh.h +3 -3lib/vtls/cipher_suite.c +6 -6lib/vtls/gtls.c +3 -3lib/vtls/mbedtls.c +3 -3lib/vtls/openssl.c +4 -4lib/vtls/rustls.c +3 -3lib/vtls/schannel.h +2 -2lib/vtls/schannel_verify.c +2 -2lib/vtls/vtls.c +9 -9lib/vtls/wolfssl.c +1 -1m4/curl-functions.m4 +1 -1scripts/schemetable.c +1 -1src/tool_cb_rea.c +4 -4src/tool_filetime.c +1 -1src/tool_filetime.h +2 -3src/tool_main.c +2 -2src/tool_operate.c +1 -1tests/http/testenv/mod_curltest/mod_curltest.c +1 -1tests/libtest/lib1960.c +1 -1tests/libtest/lib3207.c +1 -1tests/libtest/lib518.c +2 -2tests/libtest/lib530.c +2 -2tests/libtest/lib537.c +2 -2tests/libtest/lib582.c +2 -2tests/server/mqttd.c +2 -2tests/server/resolve.c +5 -5tests/server/sockfilt.c +8 -8tests/server/socksd.c +6 -6tests/server/sws.c +16 -16tests/server/tftpd.c +1 -1tests/unit/unit1979.c +1 -1tests/unit/unit1980.c +1 -1tests/unit/unit3205.c +7 -7
include/curl/curl.h+3 -3
| @@ -102,7 +102,7 @@ | |
| #include <sys/time.h> | |
| #endif | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
| @@ -124,7 +124,7 @@ typedef void CURLSH; | |
| #elif defined(_WIN32) || \ | |
| (CURL_HAS_DECLSPEC_ATTRIBUTE(dllexport) && \ | |
| CURL_HAS_DECLSPEC_ATTRIBUTE(dllimport)) | |
| - | # if defined(BUILDING_LIBCURL) |
| + | # ifdef BUILDING_LIBCURL |
| # define CURL_EXTERN __declspec(dllexport) | |
| # else | |
| # define CURL_EXTERN __declspec(dllimport) | |
| @@ -3302,7 +3302,7 @@ CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle, | |
| void *userptr); | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| } /* end of extern "C" */ | |
| #endif | |
include/curl/easy.h+2 -2
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
| @@ -118,7 +118,7 @@ CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer, | |
| */ | |
| CURL_EXTERN CURLcode curl_easy_upkeep(CURL *curl); | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| } /* end of extern "C" */ | |
| #endif | |
include/curl/header.h+1 -1
| @@ -24,7 +24,7 @@ | |
| * | |
| ***************************************************************************/ | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
include/curl/mprintf.h+3 -3
| @@ -28,7 +28,7 @@ | |
| #include <stdio.h> /* needed for FILE */ | |
| #include "curl.h" /* for CURL_EXTERN */ | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
| @@ -38,7 +38,7 @@ extern "C" { | |
| defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ | |
| !defined(CURL_NO_FMT_CHECKS) | |
| #if defined(__MINGW32__) && !defined(__clang__) | |
| - | #if defined(__MINGW_PRINTF_FORMAT) /* mingw-w64 3.0.0+. Needs stdio.h. */ |
| + | #ifdef __MINGW_PRINTF_FORMAT /* mingw-w64 3.0.0+. Needs stdio.h. */ |
| #define CURL_TEMP_PRINTF(fmt, arg) \ | |
| __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, arg))) | |
| #else | |
| @@ -78,7 +78,7 @@ CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args) | |
| #undef CURL_TEMP_PRINTF | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| } /* end of extern "C" */ | |
| #endif | |
include/curl/multi.h+1 -1
| @@ -50,7 +50,7 @@ | |
| */ | |
| #include "curl.h" | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
include/curl/options.h+1 -1
| @@ -24,7 +24,7 @@ | |
| * | |
| ***************************************************************************/ | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
include/curl/system.h+9 -9
| @@ -66,7 +66,7 @@ | |
| # define CURL_TYPEOF_CURL_SOCKLEN_T int | |
| #elif defined(__POCC__) | |
| - | # if defined(_MSC_VER) |
| + | # ifdef _MSC_VER |
| # define CURL_TYPEOF_CURL_OFF_T __int64 | |
| # define CURL_FORMAT_CURL_OFF_T "I64d" | |
| # define CURL_FORMAT_CURL_OFF_TU "I64u" | |
| @@ -82,7 +82,7 @@ | |
| # define CURL_TYPEOF_CURL_SOCKLEN_T int | |
| #elif defined(__LCC__) | |
| - | # if defined(__MCST__) /* MCST eLbrus Compiler Collection */ |
| + | # ifdef __MCST__ /* MCST eLbrus Compiler Collection */ |
| # define CURL_TYPEOF_CURL_OFF_T long | |
| # define CURL_FORMAT_CURL_OFF_T "ld" | |
| # define CURL_FORMAT_CURL_OFF_TU "lu" | |
| @@ -118,7 +118,7 @@ | |
| # define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int | |
| #elif defined(__TANDEM) | |
| - | # if !defined(__LP64) |
| + | # ifndef __LP64 |
| # define CURL_TYPEOF_CURL_OFF_T long long | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| # define CURL_FORMAT_CURL_OFF_TU "llu" | |
| @@ -135,7 +135,7 @@ | |
| # endif | |
| #elif defined(UNDER_CE) | |
| - | # if defined(__MINGW32CE__) |
| + | # ifdef __MINGW32CE__ |
| # define CURL_TYPEOF_CURL_OFF_T long long | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| # define CURL_FORMAT_CURL_OFF_TU "llu" | |
| @@ -162,7 +162,7 @@ | |
| # define CURL_PULL_SYS_TYPES_H 1 | |
| #elif defined(__VMS) | |
| - | # if defined(__VAX) |
| + | # ifdef __VAX |
| # define CURL_TYPEOF_CURL_OFF_T long | |
| # define CURL_FORMAT_CURL_OFF_T "ld" | |
| # define CURL_FORMAT_CURL_OFF_TU "lu" | |
| @@ -188,7 +188,7 @@ | |
| # define CURL_PULL_SYS_SOCKET_H 1 | |
| #elif defined(__MVS__) | |
| - | # if defined(_LONG_LONG) |
| + | # ifdef _LONG_LONG |
| # define CURL_TYPEOF_CURL_OFF_T long long | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| # define CURL_FORMAT_CURL_OFF_TU "llu" | |
| @@ -207,7 +207,7 @@ | |
| #elif defined(__370__) | |
| # if defined(__IBMC__) || defined(__IBMCPP__) | |
| - | # if defined(_LONG_LONG) |
| + | # ifdef _LONG_LONG |
| # define CURL_TYPEOF_CURL_OFF_T long long | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| # define CURL_FORMAT_CURL_OFF_TU "llu" | |
| @@ -266,7 +266,7 @@ | |
| # define CURL_PULL_SYS_SOCKET_H 1 | |
| #elif defined(__xlc__) /* IBM xlc compiler */ | |
| - | # if !defined(_LP64) |
| + | # ifndef _LP64 |
| # define CURL_TYPEOF_CURL_OFF_T long long | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| # define CURL_FORMAT_CURL_OFF_TU "llu" | |
| @@ -284,7 +284,7 @@ | |
| # define CURL_PULL_SYS_SOCKET_H 1 | |
| #elif defined(__hpux) /* HP aCC compiler */ | |
| - | # if !defined(_LP64) |
| + | # ifndef _LP64 |
| # define CURL_TYPEOF_CURL_OFF_T long long | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| # define CURL_FORMAT_CURL_OFF_TU "llu" | |
include/curl/urlapi.h+1 -1
| @@ -26,7 +26,7 @@ | |
| #include "curl.h" | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
include/curl/websockets.h+2 -2
| @@ -24,7 +24,7 @@ | |
| * | |
| ***************************************************************************/ | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| extern "C" { | |
| #endif | |
| @@ -78,7 +78,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL *curl, const void *buffer, | |
| CURL_EXTERN const struct curl_ws_frame *curl_ws_meta(CURL *curl); | |
| - | #ifdef __cplusplus |
| + | #ifdef __cplusplus |
| } | |
| #endif | |
lib/asyn.h+1 -1
| @@ -236,7 +236,7 @@ struct doh_probes; | |
| #ifdef USE_CURL_ASYNC | |
| struct Curl_async { | |
| - | #ifdef CURLRES_ARES /* */ |
| + | #ifdef CURLRES_ARES |
| struct async_ares_ctx ares; | |
| #elif defined(CURLRES_THREADED) | |
| struct async_thrdd_ctx thrdd; | |
lib/cf-h2-proxy.h+1 -2
| @@ -33,7 +33,6 @@ CURLcode Curl_cf_h2_proxy_insert_after(struct Curl_cfilter *cf, | |
| extern struct Curl_cftype Curl_cft_h2_proxy; | |
| - | |
| - | #endif /* defined(USE_NGHTTP2) && !defined(CURL_DISABLE_PROXY) */ |
| + | #endif /* USE_NGHTTP2 && !CURL_DISABLE_PROXY */ |
| #endif /* HEADER_CURL_H2_PROXY_H */ | |
lib/cf-haproxy.c+1 -1
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if !defined(CURL_DISABLE_PROXY) |
| + | #ifndef CURL_DISABLE_PROXY |
| #include <curl/curl.h> | |
| #include "urldata.h" | |
lib/cf-haproxy.h+1 -1
| @@ -27,7 +27,7 @@ | |
| #include "curl_setup.h" | |
| #include "urldata.h" | |
| - | #if !defined(CURL_DISABLE_PROXY) |
| + | #ifndef CURL_DISABLE_PROXY |
| CURLcode Curl_cf_haproxy_insert_after(struct Curl_cfilter *cf_at, | |
| struct Curl_easy *data); | |
lib/cf-https-connect.c+2 -2
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if !defined(CURL_DISABLE_HTTP) |
| + | #ifndef CURL_DISABLE_HTTP |
| #include "urldata.h" | |
| #include <curl/curl.h> | |
| @@ -749,4 +749,4 @@ out: | |
| return result; | |
| } | |
| - | #endif /* !defined(CURL_DISABLE_HTTP) */ |
| + | #endif /* !CURL_DISABLE_HTTP */ |
lib/cf-https-connect.h+2 -2
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "curl_setup.h" | |
| - | #if !defined(CURL_DISABLE_HTTP) |
| + | #ifndef CURL_DISABLE_HTTP |
| struct Curl_cfilter; | |
| struct Curl_easy; | |
| @@ -45,5 +45,5 @@ CURLcode Curl_cf_https_setup(struct Curl_easy *data, | |
| int sockindex); | |
| - | #endif /* !defined(CURL_DISABLE_HTTP) */ |
| + | #endif /* !CURL_DISABLE_HTTP */ |
| #endif /* HEADER_CURL_CF_HTTP_H */ | |
lib/cf-socket.c+8 -8
| @@ -109,7 +109,7 @@ static void set_ipv6_v6only(curl_socket_t sockfd, int on) | |
| static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd) | |
| { | |
| - | #if defined(TCP_NODELAY) |
| + | #ifdef TCP_NODELAY |
| curl_socklen_t onoff = (curl_socklen_t) 1; | |
| int level = IPPROTO_TCP; | |
| char buffer[STRERROR_LEN]; | |
| @@ -136,7 +136,7 @@ static void nosigpipe(struct Curl_easy *data, | |
| (void)data; | |
| if(setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, | |
| (void *)&onoff, sizeof(onoff)) < 0) { | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| char buffer[STRERROR_LEN]; | |
| infof(data, "Could not set SO_NOSIGPIPE: %s", | |
| Curl_strerror(SOCKERRNO, buffer, sizeof(buffer))); | |
| @@ -188,9 +188,9 @@ tcpkeepalive(struct Curl_easy *data, | |
| sockfd, SOCKERRNO); | |
| } | |
| else { | |
| - | #if defined(SIO_KEEPALIVE_VALS) /* Windows */ |
| + | #ifdef SIO_KEEPALIVE_VALS /* Windows */ |
| /* Windows 10, version 1709 (10.0.16299) and later versions */ | |
| - | #if defined(CURL_WINSOCK_KEEP_SSO) |
| + | #ifdef CURL_WINSOCK_KEEP_SSO |
| optval = curlx_sltosi(data->set.tcp_keepidle); | |
| KEEPALIVE_FACTOR(optval); | |
| if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE, | |
| @@ -885,7 +885,7 @@ static CURLcode socket_connect_result(struct Curl_easy *data, | |
| switch(error) { | |
| case SOCKEINPROGRESS: | |
| case SOCKEWOULDBLOCK: | |
| - | #if defined(EAGAIN) |
| + | #ifdef EAGAIN |
| #if (EAGAIN) != (SOCKEWOULDBLOCK) | |
| /* On some platforms EAGAIN and EWOULDBLOCK are the | |
| * same value, and on others they are different, hence | |
| @@ -1237,8 +1237,8 @@ static int do_connect(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| (void)data; | |
| if(is_tcp_fastopen) { | |
| - | #if defined(CONNECT_DATA_IDEMPOTENT) /* Darwin */ |
| - | # if defined(HAVE_BUILTIN_AVAILABLE) |
| + | #ifdef CONNECT_DATA_IDEMPOTENT /* Darwin */ |
| + | # ifdef HAVE_BUILTIN_AVAILABLE |
| /* while connectx function is available since macOS 10.11 / iOS 9, | |
| it did not have the interface declared correctly until | |
| Xcode 9 / macOS SDK 10.13 */ | |
| @@ -1505,7 +1505,7 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| else | |
| *pnwritten = (size_t)nwritten; | |
| - | #if defined(USE_WINSOCK) |
| + | #ifdef USE_WINSOCK |
| if(!result) | |
| win_update_sndbuf_size(ctx); | |
| #endif | |
lib/connect.c+4 -4
| @@ -1309,7 +1309,7 @@ connect_sub_chain: | |
| } | |
| #endif /* USE_SSL */ | |
| - | #if !defined(CURL_DISABLE_HTTP) |
| + | #ifndef CURL_DISABLE_HTTP |
| if(cf->conn->bits.tunnel_proxy) { | |
| result = Curl_cf_http_proxy_insert_after(cf, data); | |
| if(result) | |
| @@ -1323,7 +1323,7 @@ connect_sub_chain: | |
| #endif /* !CURL_DISABLE_PROXY */ | |
| if(ctx->state < CF_SETUP_CNNCT_HAPROXY) { | |
| - | #if !defined(CURL_DISABLE_PROXY) |
| + | #ifndef CURL_DISABLE_PROXY |
| if(data->set.haproxyprotocol) { | |
| if(Curl_conn_is_ssl(cf->conn, cf->sockindex)) { | |
| failf(data, "haproxy protocol not support with SSL " | |
| @@ -1502,7 +1502,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data, | |
| Curl_resolv_unlink(data, &data->state.dns[sockindex]); | |
| data->state.dns[sockindex] = dns; | |
| - | #if !defined(CURL_DISABLE_HTTP) |
| + | #ifndef CURL_DISABLE_HTTP |
| if(!conn->cfilter[sockindex] && | |
| conn->handler->protocol == CURLPROTO_HTTPS) { | |
| DEBUGASSERT(ssl_mode != CURL_CF_SSL_DISABLE); | |
| @@ -1510,7 +1510,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data, | |
| if(result) | |
| goto out; | |
| } | |
| - | #endif /* !defined(CURL_DISABLE_HTTP) */ |
| + | #endif /* !CURL_DISABLE_HTTP */ |
| /* Still no cfilter set, apply default. */ | |
| if(!conn->cfilter[sockindex]) { | |
lib/cshutdn.c+2 -2
| @@ -498,7 +498,7 @@ void Curl_cshutdn_setfds(struct cshutdn *cshutdn, | |
| Curl_detach_connection(data); | |
| for(i = 0; i < ps.num; i++) { | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| @@ -506,7 +506,7 @@ void Curl_cshutdn_setfds(struct cshutdn *cshutdn, | |
| FD_SET(ps.sockets[i], read_fd_set); | |
| if(ps.actions[i] & CURL_POLL_OUT) | |
| FD_SET(ps.sockets[i], write_fd_set); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if((ps.actions[i] & (CURL_POLL_OUT | CURL_POLL_IN)) && | |
lib/curl_addrinfo.c+3 -3
| @@ -68,7 +68,7 @@ | |
| */ | |
| #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \ | |
| - | defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__) |
| + | defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__) |
| /* workaround icc 9.1 optimizer issue */ | |
| # define vqualifier volatile | |
| #else | |
| @@ -513,7 +513,7 @@ curl_dbg_freeaddrinfo(struct addrinfo *freethis, | |
| freeaddrinfo(freethis); | |
| #endif | |
| } | |
| - | #endif /* defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO) */ |
| + | #endif /* CURLDEBUG && HAVE_FREEADDRINFO */ |
| #if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) | |
| @@ -553,7 +553,7 @@ curl_dbg_getaddrinfo(const char *hostname, | |
| source, line); | |
| return res; | |
| } | |
| - | #endif /* defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) */ |
| + | #endif /* CURLDEBUG && HAVE_GETADDRINFO */ |
| #if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS) | |
| /* | |
lib/curl_gssapi.c+1 -1
| @@ -34,7 +34,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #if defined(__GNUC__) |
| + | #ifdef __GNUC__ |
| #define CURL_ALIGN8 __attribute__((aligned(8))) | |
| #else | |
| #define CURL_ALIGN8 | |
lib/curl_md4.h+2 -2
| @@ -27,13 +27,13 @@ | |
| #include "curl_setup.h" | |
| #include <curl/curl.h> | |
| - | #if defined(USE_CURL_NTLM_CORE) |
| + | #ifdef USE_CURL_NTLM_CORE |
| #define MD4_DIGEST_LENGTH 16 | |
| CURLcode Curl_md4it(unsigned char *output, const unsigned char *input, | |
| const size_t len); | |
| - | #endif /* defined(USE_CURL_NTLM_CORE) */ |
| + | #endif /* USE_CURL_NTLM_CORE */ |
| #endif /* HEADER_CURL_MD4_H */ | |
lib/curl_ntlm_core.c+15 -15
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(USE_CURL_NTLM_CORE) |
| + | #ifdef USE_CURL_NTLM_CORE |
| /* | |
| * NTLM details: | |
| @@ -51,26 +51,26 @@ | |
| in NTLM type-3 messages. | |
| */ | |
| - | #if defined(USE_OPENSSL) |
| + | #ifdef USE_OPENSSL |
| #include <openssl/opensslconf.h> | |
| #if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0) | |
| #define USE_OPENSSL_DES | |
| #endif | |
| #elif defined(USE_WOLFSSL) | |
| #include <wolfssl/options.h> | |
| - | #if !defined(NO_DES3) |
| + | #ifndef NO_DES3 |
| #define USE_OPENSSL_DES | |
| #endif | |
| #endif | |
| - | #if defined(USE_OPENSSL_DES) |
| + | #ifdef USE_OPENSSL_DES |
| - | #if defined(USE_OPENSSL) |
| + | #ifdef USE_OPENSSL |
| # include <openssl/des.h> | |
| # include <openssl/md5.h> | |
| # include <openssl/ssl.h> | |
| # include <openssl/rand.h> | |
| - | # if defined(OPENSSL_IS_AWSLC) |
| + | # ifdef OPENSSL_IS_AWSLC |
| # define DES_set_key_unchecked (void)DES_set_key | |
| # define DESKEYARG(x) *x | |
| # define DESKEY(x) &x | |
| @@ -83,7 +83,7 @@ | |
| # include <wolfssl/openssl/md5.h> | |
| # include <wolfssl/openssl/ssl.h> | |
| # include <wolfssl/openssl/rand.h> | |
| - | # if defined(OPENSSL_COEXIST) |
| + | # ifdef OPENSSL_COEXIST |
| # define DES_key_schedule WOLFSSL_DES_key_schedule | |
| # define DES_cblock WOLFSSL_DES_cblock | |
| # define DES_set_odd_parity wolfSSL_DES_set_odd_parity | |
| @@ -129,7 +129,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #if !defined(CURL_NTLM_NOT_SUPPORTED) |
| + | #ifndef CURL_NTLM_NOT_SUPPORTED |
| /* | |
| * Turns a 56-bit key into being 64-bit wide. | |
| */ | |
| @@ -146,7 +146,7 @@ static void extend_key_56_to_64(const unsigned char *key_56, char *key) | |
| } | |
| #endif | |
| - | #if defined(USE_OPENSSL_DES) |
| + | #ifdef USE_OPENSSL_DES |
| /* | |
| * Turns a 56-bit key into a 64-bit, odd parity key and sets the key. The | |
| * key schedule ks is also set. | |
| @@ -277,7 +277,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out, | |
| return TRUE; | |
| } | |
| - | #endif /* defined(USE_WIN32_CRYPTO) */ |
| + | #endif /* USE_WIN32_CRYPTO */ |
| /* | |
| * takes a 21 byte array and treats it as 3 56-bit DES keys. The | |
| @@ -288,7 +288,7 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys, | |
| const unsigned char *plaintext, | |
| unsigned char *results) | |
| { | |
| - | #if defined(USE_OPENSSL_DES) |
| + | #ifdef USE_OPENSSL_DES |
| DES_key_schedule ks; | |
| setup_des_key(keys, DESKEY(ks)); | |
| @@ -329,7 +329,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password, | |
| unsigned char *lmbuffer /* 21 bytes */) | |
| { | |
| unsigned char pw[14]; | |
| - | #if !defined(CURL_NTLM_NOT_SUPPORTED) |
| + | #ifndef CURL_NTLM_NOT_SUPPORTED |
| static const unsigned char magic[] = { | |
| 0x4B, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25 /* i.e. KGS!@#$% */ | |
| }; | |
| @@ -342,7 +342,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password, | |
| { | |
| /* Create LanManager hashed password. */ | |
| - | #if defined(USE_OPENSSL_DES) |
| + | #ifdef USE_OPENSSL_DES |
| DES_key_schedule ks; | |
| setup_des_key(pw, DESKEY(ks)); | |
| @@ -380,7 +380,7 @@ static void ascii_to_unicode_le(unsigned char *dest, const char *src, | |
| } | |
| } | |
| - | #if !defined(USE_WINDOWS_SSPI) |
| + | #ifndef USE_WINDOWS_SSPI |
| static void ascii_uppercase_to_unicode_le(unsigned char *dest, | |
| const char *src, size_t srclen) | |
| @@ -422,7 +422,7 @@ CURLcode Curl_ntlm_core_mk_nt_hash(const char *password, | |
| return result; | |
| } | |
| - | #if !defined(USE_WINDOWS_SSPI) |
| + | #ifndef USE_WINDOWS_SSPI |
| #define NTLMv2_BLOB_SIGNATURE "\x01\x01\x00\x00" | |
| #define NTLMv2_BLOB_LEN (44 -16 + ntlm->target_info_len + 4) | |
lib/curl_ntlm_core.h+2 -2
| @@ -26,7 +26,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(USE_CURL_NTLM_CORE) |
| + | #ifdef USE_CURL_NTLM_CORE |
| #include "vauth/vauth.h" | |
| @@ -47,7 +47,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password, | |
| CURLcode Curl_ntlm_core_mk_nt_hash(const char *password, | |
| unsigned char *ntbuffer /* 21 bytes */); | |
| - | #if !defined(USE_WINDOWS_SSPI) |
| + | #ifndef USE_WINDOWS_SSPI |
| CURLcode Curl_hmac_md5(const unsigned char *key, unsigned int keylen, | |
| const unsigned char *data, unsigned int datalen, | |
lib/curl_sasl.c+2 -2
| @@ -557,7 +557,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct Curl_easy *data, | |
| /* Calculate the supported authentication mechanism, by decreasing order of | |
| security, as well as the initial response where appropriate */ | |
| if(sasl_choose_external(data, &sctx) || | |
| - | #if defined(USE_KERBEROS5) |
| + | #ifdef USE_KERBEROS5 |
| sasl_choose_krb5(data, &sctx) || | |
| #endif | |
| #ifdef USE_GSASL | |
| @@ -722,7 +722,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct Curl_easy *data, | |
| } | |
| #endif | |
| - | #if defined(USE_KERBEROS5) |
| + | #ifdef USE_KERBEROS5 |
| case SASL_GSSAPI: { | |
| struct kerberos5data *krb5 = Curl_auth_krb5_get(conn); | |
| result = !krb5 ? CURLE_OUT_OF_MEMORY : | |
lib/curl_setup.h+6 -6
| @@ -331,10 +331,10 @@ | |
| #define CURL_CONC_MACROS(A,B) CURL_CONC_MACROS_(A,B) | |
| /* curl uses its own printf() function internally. It understands the GNU | |
| - | * format. Use this format, so that is matches the GNU format attribute we |
| + | * format. Use this format, so that it matches the GNU format attribute we |
| * use with the MinGW compiler, allowing it to verify them at compile-time. | |
| */ | |
| - | #ifdef __MINGW32__ |
| + | #ifdef __MINGW32__ |
| # undef CURL_FORMAT_CURL_OFF_T | |
| # undef CURL_FORMAT_CURL_OFF_TU | |
| # define CURL_FORMAT_CURL_OFF_T "lld" | |
| @@ -549,11 +549,11 @@ | |
| #ifndef SIZEOF_OFF_T | |
| # if defined(__VMS) && !defined(__VAX) | |
| - | # if defined(_LARGEFILE) |
| + | # ifdef _LARGEFILE |
| # define SIZEOF_OFF_T 8 | |
| # endif | |
| # elif defined(__OS400__) && defined(__ILEC400__) | |
| - | # if defined(_LARGE_FILES) |
| + | # ifdef _LARGE_FILES |
| # define SIZEOF_OFF_T 8 | |
| # endif | |
| # elif defined(__MVS__) && defined(__IBMC__) | |
| @@ -932,7 +932,7 @@ endings either CRLF or LF so 't' is appropriate. | |
| /* for systems that do not detect this in configure */ | |
| #ifndef CURL_SA_FAMILY_T | |
| - | # if defined(HAVE_SA_FAMILY_T) |
| + | # ifdef HAVE_SA_FAMILY_T |
| # define CURL_SA_FAMILY_T sa_family_t | |
| # elif defined(HAVE_ADDRESS_FAMILY) | |
| # define CURL_SA_FAMILY_T ADDRESS_FAMILY | |
| @@ -1003,7 +1003,7 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, | |
| #endif | |
| #if defined(USE_UNIX_SOCKETS) && defined(_WIN32) | |
| - | # if !defined(UNIX_PATH_MAX) |
| + | # ifndef UNIX_PATH_MAX |
| /* Replicating logic present in afunix.h | |
| (distributed with newer Windows 10 SDK versions only) */ | |
| # define UNIX_PATH_MAX 108 | |
lib/curl_sha512_256.c+3 -3
| @@ -38,7 +38,7 @@ | |
| * * Rustls | |
| * Skip the backend if it does not support the required algorithm */ | |
| - | #if defined(USE_OPENSSL) |
| + | #ifdef USE_OPENSSL |
| # include <openssl/opensslv.h> | |
| # if (!defined(LIBRESSL_VERSION_NUMBER) && \ | |
| defined(OPENSSL_VERSION_NUMBER) && \ | |
| @@ -78,12 +78,12 @@ | |
| #if !defined(HAS_SHA512_256_IMPLEMENTATION) && defined(USE_GNUTLS) | |
| # include <nettle/sha.h> | |
| - | # if defined(SHA512_256_DIGEST_SIZE) |
| + | # ifdef SHA512_256_DIGEST_SIZE |
| # define USE_GNUTLS_SHA512_256 1 | |
| # endif | |
| #endif /* ! HAS_SHA512_256_IMPLEMENTATION && USE_GNUTLS */ | |
| - | #if defined(USE_OPENSSL_SHA512_256) |
| + | #ifdef USE_OPENSSL_SHA512_256 |
| /* OpenSSL does not provide macros for SHA-512/256 sizes */ | |
lib/curl_threads.c+2 -2
| @@ -26,7 +26,7 @@ | |
| #include <curl/curl.h> | |
| - | #if defined(USE_THREADS_POSIX) |
| + | #ifdef USE_THREADS_POSIX |
| # ifdef HAVE_PTHREAD_H | |
| # include <pthread.h> | |
| # endif | |
| @@ -39,7 +39,7 @@ | |
| /* The last #include file should be: */ | |
| #include "memdebug.h" | |
| - | #if defined(USE_THREADS_POSIX) |
| + | #ifdef USE_THREADS_POSIX |
| struct Curl_actual_call { | |
| unsigned int (*func)(void *); | |
lib/curl_threads.h+1 -1
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "curl_setup.h" | |
| - | #if defined(USE_THREADS_POSIX) |
| + | #ifdef USE_THREADS_POSIX |
| # define CURL_STDCALL | |
| # define curl_mutex_t pthread_mutex_t | |
| # define curl_thread_t pthread_t * | |
lib/curl_trc.c+6 -6
| @@ -199,7 +199,7 @@ void Curl_failf(struct Curl_easy *data, const char *fmt, ...) | |
| } | |
| } | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| static void trc_infof(struct Curl_easy *data, | |
| struct curl_trc_feat *feat, | |
| @@ -471,8 +471,8 @@ static struct trc_cft_def trc_cfts[] = { | |
| { &Curl_cft_ssl_proxy, TRC_CT_PROXY }, | |
| #endif | |
| #endif | |
| - | #if !defined(CURL_DISABLE_PROXY) |
| - | #if !defined(CURL_DISABLE_HTTP) |
| + | #ifndef CURL_DISABLE_PROXY |
| + | #ifndef CURL_DISABLE_HTTP |
| { &Curl_cft_h1_proxy, TRC_CT_PROXY }, | |
| #ifdef USE_NGHTTP2 | |
| { &Curl_cft_h2_proxy, TRC_CT_PROXY }, | |
| @@ -485,7 +485,7 @@ static struct trc_cft_def trc_cfts[] = { | |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP3) | |
| { &Curl_cft_http3, TRC_CT_PROTOCOL }, | |
| #endif | |
| - | #if !defined(CURL_DISABLE_HTTP) |
| + | #ifndef CURL_DISABLE_HTTP |
| { &Curl_cft_http_connect, TRC_CT_PROTOCOL }, | |
| #endif | |
| }; | |
| @@ -580,7 +580,7 @@ CURLcode Curl_trc_init(void) | |
| #endif | |
| } | |
| - | #else /* defined(CURL_DISABLE_VERBOSE_STRINGS) */ |
| + | #else /* CURL_DISABLE_VERBOSE_STRINGS */ |
| CURLcode Curl_trc_init(void) | |
| { | |
| @@ -646,4 +646,4 @@ void Curl_trc_ssls(struct Curl_easy *data, const char *fmt, ...) | |
| } | |
| #endif | |
| - | #endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */ |
| + | #endif /* !CURL_DISABLE_VERBOSE_STRINGS */ |
lib/curl_trc.h+2 -2
| @@ -203,7 +203,7 @@ extern struct curl_trc_feat Curl_trc_feat_dns; | |
| (ft)->log_level >= CURL_LOG_LVL_INFO) | |
| #define CURL_MSTATE_NAME(s) Curl_trc_mstate_name((int)(s)) | |
| - | #else /* defined(CURL_DISABLE_VERBOSE_STRINGS) */ |
| + | #else /* CURL_DISABLE_VERBOSE_STRINGS */ |
| /* All informational messages are not compiled in for size savings */ | |
| #define Curl_trc_is_verbose(d) (FALSE) | |
| @@ -211,6 +211,6 @@ extern struct curl_trc_feat Curl_trc_feat_dns; | |
| #define Curl_trc_ft_is_verbose(x,y) (FALSE) | |
| #define CURL_MSTATE_NAME(x) ((void)(x), "-") | |
| - | #endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */ |
| + | #endif /* !CURL_DISABLE_VERBOSE_STRINGS */ |
| #endif /* HEADER_CURL_TRC_H */ | |
lib/curlx/nonblock.c+1 -1
| @@ -46,7 +46,7 @@ | |
| int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ | |
| int nonblock /* TRUE or FALSE */) | |
| { | |
| - | #if defined(HAVE_FCNTL_O_NONBLOCK) |
| + | #ifdef HAVE_FCNTL_O_NONBLOCK |
| /* most recent Unix versions */ | |
| int flags; | |
| flags = sfcntl(sockfd, F_GETFL, 0); | |
lib/curlx/wait.c+1 -1
| @@ -68,7 +68,7 @@ int curlx_wait_ms(timediff_t timeout_ms) | |
| SET_SOCKERRNO(SOCKEINVAL); | |
| return -1; | |
| } | |
| - | #if defined(MSDOS) |
| + | #ifdef MSDOS |
| delay((unsigned int)timeout_ms); | |
| #elif defined(_WIN32) | |
| /* prevent overflow, timeout_ms is typecast to ULONG/DWORD. */ | |
lib/easy.c+2 -4
| @@ -107,7 +107,7 @@ static curl_simple_lock s_lock = CURL_SIMPLE_LOCK_INIT; | |
| * ways, but at this point it must be defined as the system-supplied strdup | |
| * so the callback pointer is initialized correctly. | |
| */ | |
| - | #if defined(UNDER_CE) |
| + | #ifdef UNDER_CE |
| #define system_strdup _strdup | |
| #elif !defined(HAVE_STRDUP) | |
| #define system_strdup Curl_strdup | |
| @@ -465,7 +465,7 @@ static int events_socket(CURL *easy, /* easy handle */ | |
| bool found = FALSE; | |
| struct Curl_easy *data = easy; | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)easy; | |
| #endif | |
| (void)socketp; | |
| @@ -822,7 +822,6 @@ static CURLcode easy_perform(struct Curl_easy *data, bool events) | |
| return result; | |
| } | |
| - | |
| /* | |
| * curl_easy_perform() is the external interface that performs a blocking | |
| * transfer as previously setup. | |
| @@ -841,7 +840,6 @@ CURLcode curl_easy_perform_ev(struct Curl_easy *data) | |
| { | |
| return easy_perform(data, TRUE); | |
| } | |
| - | |
| #endif | |
| /* | |
lib/easy_lock.h+1 -1
| @@ -44,7 +44,7 @@ | |
| #elif defined(HAVE_ATOMIC) && defined(HAVE_STDATOMIC_H) | |
| #include <stdatomic.h> | |
| - | #if defined(HAVE_SCHED_YIELD) |
| + | #ifdef HAVE_SCHED_YIELD |
| #include <sched.h> | |
| #endif | |
lib/file.c+1 -1
| @@ -348,7 +348,7 @@ static CURLcode file_upload(struct Curl_easy *data, | |
| mode |= O_TRUNC; | |
| #if (defined(ANDROID) || defined(__ANDROID__)) && \ | |
| - | (defined(__i386__) || defined(__arm__)) |
| + | (defined(__i386__) || defined(__arm__)) |
| fd = open(file->path, mode, (mode_t)data->set.new_file_perms); | |
| #else | |
| fd = open(file->path, mode, data->set.new_file_perms); | |
lib/fileinfo.c+3 -0
| @@ -23,7 +23,9 @@ | |
| ***************************************************************************/ | |
| #include "curl_setup.h" | |
| + | |
| #ifndef CURL_DISABLE_FTP | |
| + | |
| #include "strdup.h" | |
| #include "fileinfo.h" | |
| #include "curl_memory.h" | |
| @@ -43,4 +45,5 @@ void Curl_fileinfo_cleanup(struct fileinfo *finfo) | |
| curlx_dyn_free(&finfo->buf); | |
| free(finfo); | |
| } | |
| + | |
| #endif | |
lib/fopen.c+1 -1
| @@ -136,7 +136,7 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, | |
| result = CURLE_WRITE_ERROR; | |
| #if (defined(ANDROID) || defined(__ANDROID__)) && \ | |
| - | (defined(__i386__) || defined(__arm__)) |
| + | (defined(__i386__) || defined(__arm__)) |
| fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, (mode_t)(0600|sb.st_mode)); | |
| #else | |
| fd = open(tempstore, O_WRONLY | O_CREAT | O_EXCL, 0600|sb.st_mode); | |
lib/ftp.c+1 -1
| @@ -150,7 +150,7 @@ static void _ftp_state(struct Curl_easy *data, | |
| #endif | |
| ) | |
| { | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #ifdef DEBUGBUILD | |
| (void)lineno; | |
lib/hostip.c+2 -2
| @@ -1258,7 +1258,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| struct Curl_addrinfo *head = NULL, *tail = NULL; | |
| size_t entry_len; | |
| char address[64]; | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| const char *addresses = NULL; | |
| #endif | |
| curl_off_t port = 0; | |
| @@ -1283,7 +1283,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data) | |
| curlx_str_single(&host, ':')) | |
| goto err; | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| addresses = host; | |
| #endif | |
lib/hostip4.c+4 -6
| @@ -94,8 +94,7 @@ struct Curl_addrinfo *Curl_sync_getaddrinfo(struct Curl_easy *data, | |
| #endif /* CURLRES_SYNCH */ | |
| #endif /* CURLRES_IPV4 */ | |
| - | #if defined(CURLRES_IPV4) && \ |
| - | !defined(CURLRES_ARES) && !defined(CURLRES_AMIGA) |
| + | #if defined(CURLRES_IPV4) && !defined(CURLRES_ARES) && !defined(CURLRES_AMIGA) |
| /* | |
| * Curl_ipv4_resolve_r() - ipv4 threadsafe resolver function. | |
| @@ -108,7 +107,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, | |
| int port) | |
| { | |
| #if !(defined(HAVE_GETADDRINFO) && defined(HAVE_GETADDRINFO_THREADSAFE)) && \ | |
| - | defined(HAVE_GETHOSTBYNAME_R_3) |
| + | defined(HAVE_GETHOSTBYNAME_R_3) |
| int res; | |
| #endif | |
| struct Curl_addrinfo *ai = NULL; | |
| @@ -149,7 +148,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, | |
| * platforms. | |
| */ | |
| - | #if defined(HAVE_GETHOSTBYNAME_R_5) |
| + | #ifdef HAVE_GETHOSTBYNAME_R_5 |
| /* Solaris, IRIX and more */ | |
| h = gethostbyname_r(hostname, | |
| (struct hostent *)buf, | |
| @@ -287,5 +286,4 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, | |
| return ai; | |
| } | |
| - | #endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) && |
| - | !defined(CURLRES_AMIGA) */ |
| + | #endif /* CURLRES_IPV4 && !CURLRES_ARES && !CURLRES_AMIGA */ |
lib/hostip6.c+1 -1
| @@ -57,7 +57,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #if defined(CURLRES_SYNCH) |
| + | #ifdef CURLRES_SYNCH |
| #ifdef DEBUG_ADDRINFO | |
| static void dump_addrinfo(const struct Curl_addrinfo *ai) | |
lib/http.c+7 -7
| @@ -474,7 +474,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data, | |
| if(abort_upload) { | |
| /* We'd like to abort the upload - but should we? */ | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| if((data->state.authproxy.picked == CURLAUTH_NTLM) || | |
| (data->state.authhost.picked == CURLAUTH_NTLM)) { | |
| ongoing_auth = "NTLM"; | |
| @@ -486,7 +486,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data, | |
| } | |
| } | |
| #endif | |
| - | #if defined(USE_SPNEGO) |
| + | #ifdef USE_SPNEGO |
| /* There is still data left to send */ | |
| if((data->state.authproxy.picked == CURLAUTH_NEGOTIATE) || | |
| (data->state.authhost.picked == CURLAUTH_NEGOTIATE)) { | |
| @@ -1896,7 +1896,7 @@ static CURLcode http_host(struct Curl_easy *data, struct connectdata *conn) | |
| ptr = Curl_checkheaders(data, STRCONST("Host")); | |
| if(ptr && (!data->state.this_is_a_follow || | |
| curl_strequal(data->state.first_host, conn->host.name))) { | |
| - | #if !defined(CURL_DISABLE_COOKIES) |
| + | #ifndef CURL_DISABLE_COOKIES |
| /* If we have a given custom Host: header, we extract the hostname in | |
| order to possibly use it for cookie reasons later on. We only allow the | |
| custom Host: header if this is NOT a redirect, as setting Host: in the | |
| @@ -2422,7 +2422,7 @@ out: | |
| return result; | |
| } | |
| - | #if !defined(CURL_DISABLE_COOKIES) |
| + | #ifndef CURL_DISABLE_COOKIES |
| static CURLcode http_cookies(struct Curl_easy *data, | |
| struct connectdata *conn, | |
| @@ -3321,7 +3321,7 @@ static CURLcode http_header_s(struct Curl_easy *data, | |
| (void)hdlen; | |
| #endif | |
| - | #if !defined(CURL_DISABLE_COOKIES) |
| + | #ifndef CURL_DISABLE_COOKIES |
| v = (data->cookies && data->state.cookie_engine) ? | |
| HD_VAL(hd, hdlen, "Set-Cookie:") : NULL; | |
| if(v) { | |
| @@ -3815,7 +3815,7 @@ static CURLcode http_on_response(struct Curl_easy *data, | |
| /* At this point we have some idea about the fate of the connection. | |
| If we are closing the connection it may result auth failure. */ | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| if(conn->bits.close && | |
| (((data->req.httpcode == 401) && | |
| (conn->http_ntlm_state == NTLMSTATE_TYPE2)) || | |
| @@ -3825,7 +3825,7 @@ static CURLcode http_on_response(struct Curl_easy *data, | |
| data->state.authproblem = TRUE; | |
| } | |
| #endif | |
| - | #if defined(USE_SPNEGO) |
| + | #ifdef USE_SPNEGO |
| if(conn->bits.close && | |
| (((data->req.httpcode == 401) && | |
| (conn->http_negotiate_state == GSS_AUTHRECV)) || | |
lib/http.h+1 -1
| @@ -58,7 +58,7 @@ typedef unsigned char http_majors; | |
| #ifndef CURL_DISABLE_HTTP | |
| - | #if defined(USE_HTTP3) |
| + | #ifdef USE_HTTP3 |
| #include <stdint.h> | |
| #endif | |
lib/http2.c+3 -3
| @@ -488,7 +488,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, | |
| const uint8_t *value, size_t valuelen, | |
| uint8_t flags, | |
| void *userp); | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| static int error_callback(nghttp2_session *session, const char *msg, | |
| size_t len, void *userp); | |
| #endif | |
| @@ -523,7 +523,7 @@ static CURLcode cf_h2_ctx_open(struct Curl_cfilter *cf, | |
| nghttp2_session_callbacks_set_on_begin_headers_callback( | |
| cbs, on_begin_headers); | |
| nghttp2_session_callbacks_set_on_header_callback(cbs, on_header); | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| nghttp2_session_callbacks_set_error_callback(cbs, error_callback); | |
| #endif | |
| @@ -1779,7 +1779,7 @@ static ssize_t req_body_read_callback(nghttp2_session *session, | |
| return (nread == 0) ? NGHTTP2_ERR_DEFERRED : nread; | |
| } | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| static int error_callback(nghttp2_session *session, | |
| const char *msg, | |
| size_t len, | |
lib/http_aws_sigv4.c+1 -1
| @@ -1149,4 +1149,4 @@ static bool should_urlencode(struct Curl_str *service_name) | |
| return true; | |
| } | |
| - | #endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */ |
| + | #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */ |
lib/http_digest.c+1 -1
| @@ -120,7 +120,7 @@ CURLcode Curl_output_digest(struct Curl_easy *data, | |
| if(!passwdp) | |
| passwdp = ""; | |
| - | #if defined(USE_WINDOWS_SSPI) |
| + | #ifdef USE_WINDOWS_SSPI |
| have_chlg = !!digest->input_token; | |
| #else | |
| have_chlg = !!digest->nonce; | |
lib/http_ntlm.c+1 -1
| @@ -45,7 +45,7 @@ | |
| /* SSL backend-specific #if branches in this file must be kept in the order | |
| documented in curl_ntlm_core. */ | |
| - | #if defined(USE_WINDOWS_SSPI) |
| + | #ifdef USE_WINDOWS_SSPI |
| #include "curl_sspi.h" | |
| #endif | |
lib/httpsrr.h+1 -1
| @@ -76,7 +76,7 @@ void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo); | |
| #define HTTPS_RR_CODE_ECH 0x05 | |
| #define HTTPS_RR_CODE_IPV6 0x06 | |
| - | #if defined(USE_ARES) |
| + | #ifdef USE_ARES |
| CURLcode Curl_httpsrr_from_ares(struct Curl_easy *data, | |
| const ares_dns_record_t *dnsrec, | |
| struct Curl_https_rrinfo *hinfo); | |
lib/idn.c+1 -1
| @@ -51,7 +51,7 @@ | |
| #include "memdebug.h" | |
| /* for macOS and iOS targets */ | |
| - | #if defined(USE_APPLE_IDN) |
| + | #ifdef USE_APPLE_IDN |
| #include <unicode/uidna.h> | |
| #include <iconv.h> | |
| #include <langinfo.h> | |
lib/if2ip.c+1 -1
| @@ -94,7 +94,7 @@ unsigned int Curl_ipv6_scope(const struct sockaddr *sa) | |
| #if !defined(CURL_DISABLE_BINDLOCAL) || !defined(CURL_DISABLE_FTP) | |
| - | #if defined(HAVE_GETIFADDRS) |
| + | #ifdef HAVE_GETIFADDRS |
| if2ip_result_t Curl_if2ip(int af, | |
| #ifdef USE_IPV6 | |
lib/ldap.c+23 -23
| @@ -43,7 +43,7 @@ | |
| */ | |
| /* Wincrypt must be included before anything that could include OpenSSL. */ | |
| - | #if defined(USE_WIN32_CRYPTO) |
| + | #ifdef USE_WIN32_CRYPTO |
| #include <wincrypt.h> | |
| /* Undefine wincrypt conflicting symbols for BoringSSL. */ | |
| #undef X509_NAME | |
| @@ -105,7 +105,7 @@ | |
| struct ldap_urldesc { | |
| char *lud_host; | |
| int lud_port; | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| TCHAR *lud_dn; | |
| TCHAR **lud_attrs; | |
| #else | |
| @@ -113,7 +113,7 @@ struct ldap_urldesc { | |
| char **lud_attrs; | |
| #endif | |
| int lud_scope; | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| TCHAR *lud_filter; | |
| #else | |
| char *lud_filter; | |
| @@ -224,9 +224,9 @@ const struct Curl_handler Curl_handler_ldaps = { | |
| }; | |
| #endif | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| - | #if defined(USE_WINDOWS_SSPI) |
| + | #ifdef USE_WINDOWS_SSPI |
| static int ldap_win_bind_auth(LDAP *server, const char *user, | |
| const char *passwd, unsigned long authflags) | |
| { | |
| @@ -236,19 +236,19 @@ static int ldap_win_bind_auth(LDAP *server, const char *user, | |
| memset(&cred, 0, sizeof(cred)); | |
| - | #if defined(USE_SPNEGO) |
| + | #ifdef USE_SPNEGO |
| if(authflags & CURLAUTH_NEGOTIATE) { | |
| method = LDAP_AUTH_NEGOTIATE; | |
| } | |
| else | |
| #endif | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| if(authflags & CURLAUTH_NTLM) { | |
| method = LDAP_AUTH_NTLM; | |
| } | |
| else | |
| #endif | |
| - | #if !defined(CURL_DISABLE_DIGEST_AUTH) |
| + | #ifndef CURL_DISABLE_DIGEST_AUTH |
| if(authflags & CURLAUTH_DIGEST) { | |
| method = LDAP_AUTH_DIGEST; | |
| } | |
| @@ -273,7 +273,7 @@ static int ldap_win_bind_auth(LDAP *server, const char *user, | |
| } | |
| return rc; | |
| } | |
| - | #endif /* #if defined(USE_WINDOWS_SSPI) */ |
| + | #endif /* USE_WINDOWS_SSPI */ |
| static int ldap_win_bind(struct Curl_easy *data, LDAP *server, | |
| const char *user, const char *passwd) | |
| @@ -292,7 +292,7 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server, | |
| curlx_unicodefree(inuser); | |
| curlx_unicodefree(inpass); | |
| } | |
| - | #if defined(USE_WINDOWS_SSPI) |
| + | #ifdef USE_WINDOWS_SSPI |
| else { | |
| rc = (int)ldap_win_bind_auth(server, user, passwd, data->set.httpauth); | |
| } | |
| @@ -300,9 +300,9 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server, | |
| return rc; | |
| } | |
| - | #endif /* #if defined(USE_WIN32_LDAP) */ |
| + | #endif /* USE_WIN32_LDAP */ |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| #define FREE_ON_WINLDAP(x) curlx_unicodefree(x) | |
| #define curl_ldap_num_t ULONG | |
| #else | |
| @@ -328,7 +328,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done) | |
| #ifdef LDAP_OPT_NETWORK_TIMEOUT | |
| struct timeval ldap_timeout = {10, 0}; /* 10 sec connection/search timeout */ | |
| #endif | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| TCHAR *host = NULL; | |
| #else | |
| char *host = NULL; | |
| @@ -358,7 +358,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done) | |
| infof(data, "LDAP local: trying to establish %s connection", | |
| ldap_ssl ? "encrypted" : "cleartext"); | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| host = curlx_convert_UTF8_to_tchar(conn->host.name); | |
| if(!host) { | |
| result = CURLE_OUT_OF_MEMORY; | |
| @@ -516,7 +516,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done) | |
| entryIterator; | |
| entryIterator = ldap_next_entry(server, entryIterator), num++) { | |
| BerElement *ber = NULL; | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| TCHAR *attribute; | |
| #else | |
| char *attribute; | |
| @@ -527,7 +527,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done) | |
| { | |
| char *name; | |
| size_t name_len; | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| TCHAR *dn = ldap_get_dn(server, entryIterator); | |
| name = curlx_convert_tchar_to_UTF8(dn); | |
| if(!name) { | |
| @@ -574,7 +574,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done) | |
| attribute = ldap_next_attribute(server, entryIterator, ber)) { | |
| BerValue **vals; | |
| size_t attr_len; | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| char *attr = curlx_convert_tchar_to_UTF8(attribute); | |
| if(!attr) { | |
| if(ber) | |
| @@ -837,7 +837,7 @@ static int _ldap_url_parse2(struct Curl_easy *data, | |
| goto quit; | |
| } | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| /* Convert the unescaped string to a tchar */ | |
| ludp->lud_dn = curlx_convert_UTF8_to_tchar(unescaped); | |
| @@ -868,7 +868,7 @@ static int _ldap_url_parse2(struct Curl_easy *data, | |
| const char *atp = p; | |
| /* Allocate our array (+1 for the NULL entry) */ | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| ludp->lud_attrs = calloc(count + 1, sizeof(TCHAR *)); | |
| #else | |
| ludp->lud_attrs = calloc(count + 1, sizeof(char *)); | |
| @@ -896,7 +896,7 @@ static int _ldap_url_parse2(struct Curl_easy *data, | |
| goto quit; | |
| } | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| /* Convert the unescaped string to a tchar */ | |
| ludp->lud_attrs[i] = curlx_convert_UTF8_to_tchar(unescaped); | |
| @@ -960,7 +960,7 @@ static int _ldap_url_parse2(struct Curl_easy *data, | |
| goto quit; | |
| } | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| /* Convert the unescaped string to a tchar */ | |
| ludp->lud_filter = curlx_convert_UTF8_to_tchar(unescaped); | |
| @@ -1016,7 +1016,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp) | |
| if(!ludp) | |
| return; | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| curlx_unicodefree(ludp->lud_dn); | |
| curlx_unicodefree(ludp->lud_filter); | |
| #else | |
| @@ -1027,7 +1027,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp) | |
| if(ludp->lud_attrs) { | |
| size_t i; | |
| for(i = 0; i < ludp->lud_attrs_dups; i++) { | |
| - | #if defined(USE_WIN32_LDAP) |
| + | #ifdef USE_WIN32_LDAP |
| curlx_unicodefree(ludp->lud_attrs[i]); | |
| #else | |
| free(ludp->lud_attrs[i]); | |
lib/md4.c+2 -2
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(USE_CURL_NTLM_CORE) |
| + | #ifdef USE_CURL_NTLM_CORE |
| #include <string.h> | |
| @@ -220,7 +220,7 @@ static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size) | |
| static void MD4_Final(unsigned char *result, MD4_CTX *ctx) | |
| { | |
| if(ctx->data) { | |
| - | #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) |
| + | #ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS |
| mbedtls_md4(ctx->data, ctx->size, result); | |
| #else | |
| (void)mbedtls_md4_ret(ctx->data, ctx->size, result); | |
lib/md5.c+4 -4
| @@ -57,7 +57,7 @@ | |
| #endif | |
| #endif | |
| - | #if defined(USE_GNUTLS) |
| + | #ifdef USE_GNUTLS |
| #include <nettle/md5.h> | |
| #elif defined(USE_OPENSSL_MD5) | |
| #include <openssl/md5.h> | |
| @@ -84,7 +84,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #if defined(USE_GNUTLS) |
| + | #ifdef USE_GNUTLS |
| typedef struct md5_ctx my_md5_ctx; | |
| @@ -177,7 +177,7 @@ static void my_md5_update(void *ctx, | |
| const unsigned char *data, | |
| unsigned int length) | |
| { | |
| - | #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) |
| + | #ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS |
| (void)mbedtls_md5_update(ctx, data, length); | |
| #else | |
| (void)mbedtls_md5_update_ret(ctx, data, length); | |
| @@ -186,7 +186,7 @@ static void my_md5_update(void *ctx, | |
| static void my_md5_final(unsigned char *digest, void *ctx) | |
| { | |
| - | #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) |
| + | #ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS |
| (void)mbedtls_md5_finish(ctx, digest); | |
| #else | |
| (void)mbedtls_md5_finish_ret(ctx, digest); | |
lib/multi.c+4 -4
| @@ -570,11 +570,11 @@ static void multi_done_locked(struct connectdata *conn, | |
| */ | |
| if((data->set.reuse_forbid | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| && !(conn->http_ntlm_state == NTLMSTATE_TYPE2 || | |
| conn->proxy_ntlm_state == NTLMSTATE_TYPE2) | |
| #endif | |
| - | #if defined(USE_SPNEGO) |
| + | #ifdef USE_SPNEGO |
| && !(conn->http_negotiate_state == GSS_AUTHRECV || | |
| conn->proxy_negotiate_state == GSS_AUTHRECV) | |
| #endif | |
| @@ -1154,7 +1154,7 @@ CURLMcode curl_multi_fdset(CURLM *m, | |
| if(!FDSET_SOCK(ps.sockets[i])) | |
| /* pretend it does not exist */ | |
| continue; | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| @@ -1162,7 +1162,7 @@ CURLMcode curl_multi_fdset(CURLM *m, | |
| FD_SET(ps.sockets[i], read_fd_set); | |
| if(ps.actions[i] & CURL_POLL_OUT) | |
| FD_SET(ps.sockets[i], write_fd_set); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if((int)ps.sockets[i] > this_max_fd) | |
lib/multihandle.h+1 -1
| @@ -80,7 +80,7 @@ typedef enum { | |
| #define CURLPIPE_ANY (CURLPIPE_MULTIPLEX) | |
| - | #if !defined(CURL_DISABLE_SOCKETPAIR) |
| + | #ifndef CURL_DISABLE_SOCKETPAIR |
| #define ENABLE_WAKEUP | |
| #endif | |
lib/rand.c+3 -3
| @@ -72,7 +72,7 @@ CURLcode Curl_win32_random(unsigned char *entropy, size_t length) | |
| { | |
| memset(entropy, 0, length); | |
| - | #if defined(HAVE_WIN_BCRYPTGENRANDOM) |
| + | #ifdef HAVE_WIN_BCRYPTGENRANDOM |
| if(BCryptGenRandom(NULL, entropy, (ULONG)length, | |
| BCRYPT_USE_SYSTEM_PREFERRED_RNG) != STATUS_SUCCESS) | |
| return CURLE_FAILED_INIT; | |
| @@ -100,7 +100,7 @@ CURLcode Curl_win32_random(unsigned char *entropy, size_t length) | |
| } | |
| #endif | |
| - | #if !defined(USE_SSL) |
| + | #ifndef USE_SSL |
| /* ---- possibly non-cryptographic version following ---- */ | |
| static CURLcode weak_random(struct Curl_easy *data, | |
| unsigned char *entropy, | |
| @@ -119,7 +119,7 @@ static CURLcode weak_random(struct Curl_easy *data, | |
| } | |
| #endif | |
| - | #if defined(HAVE_ARC4RANDOM) |
| + | #ifdef HAVE_ARC4RANDOM |
| (void)data; | |
| r = (unsigned int)arc4random(); | |
| memcpy(entropy, &r, length); | |
lib/rtsp.c+1 -1
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if !defined(CURL_DISABLE_RTSP) |
| + | #ifndef CURL_DISABLE_RTSP |
| #include "urldata.h" | |
| #include <curl/curl.h> | |
lib/setopt.c+3 -3
| @@ -646,7 +646,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option, | |
| data->set.postfieldsize = arg; | |
| break; | |
| #ifndef CURL_DISABLE_HTTP | |
| - | #if !defined(CURL_DISABLE_COOKIES) |
| + | #ifndef CURL_DISABLE_COOKIES |
| case CURLOPT_COOKIESESSION: | |
| /* | |
| * Set this option to TRUE to start a new "cookie session". It will | |
| @@ -1778,7 +1778,7 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option, | |
| } | |
| return Curl_setstropt(&data->set.str[STRING_ENCODING], ptr); | |
| - | #if !defined(CURL_DISABLE_AWS) |
| + | #ifndef CURL_DISABLE_AWS |
| case CURLOPT_AWS_SIGV4: | |
| /* | |
| * String that is merged to some authentication | |
| @@ -1810,7 +1810,7 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option, | |
| */ | |
| return Curl_setstropt(&data->set.str[STRING_USERAGENT], ptr); | |
| - | #if !defined(CURL_DISABLE_COOKIES) |
| + | #ifndef CURL_DISABLE_COOKIES |
| case CURLOPT_COOKIE: | |
| /* | |
| * Cookie string to send to the remote server in the request. | |
lib/sha256.c+4 -4
| @@ -134,7 +134,7 @@ typedef mbedtls_sha256_context my_sha256_ctx; | |
| static CURLcode my_sha256_init(void *ctx) | |
| { | |
| - | #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) |
| + | #ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS |
| (void)mbedtls_sha256_starts(ctx, 0); | |
| #else | |
| (void)mbedtls_sha256_starts_ret(ctx, 0); | |
| @@ -146,7 +146,7 @@ static void my_sha256_update(void *ctx, | |
| const unsigned char *data, | |
| unsigned int length) | |
| { | |
| - | #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) |
| + | #ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS |
| (void)mbedtls_sha256_update(ctx, data, length); | |
| #else | |
| (void)mbedtls_sha256_update_ret(ctx, data, length); | |
| @@ -155,7 +155,7 @@ static void my_sha256_update(void *ctx, | |
| static void my_sha256_final(unsigned char *digest, void *ctx) | |
| { | |
| - | #if !defined(HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS) |
| + | #ifndef HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS |
| (void)mbedtls_sha256_finish(ctx, digest); | |
| #else | |
| (void)mbedtls_sha256_finish_ret(ctx, digest); | |
| @@ -191,7 +191,7 @@ struct sha256_ctx { | |
| }; | |
| typedef struct sha256_ctx my_sha256_ctx; | |
| - | #if !defined(CALG_SHA_256) |
| + | #ifndef CALG_SHA_256 |
| #define CALG_SHA_256 0x0000800c | |
| #endif | |
lib/smb.c+1 -2
| @@ -1267,5 +1267,4 @@ static CURLcode smb_parse_url_path(struct Curl_easy *data, | |
| return CURLE_OK; | |
| } | |
| - | #endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && |
| - | SIZEOF_CURL_OFF_T > 4 */ |
| + | #endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && SIZEOF_CURL_OFF_T > 4 */ |
lib/smb.h+2 -3
| @@ -26,12 +26,11 @@ | |
| ***************************************************************************/ | |
| #if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \ | |
| - | (SIZEOF_CURL_OFF_T > 4) |
| + | (SIZEOF_CURL_OFF_T > 4) |
| extern const struct Curl_handler Curl_handler_smb; | |
| extern const struct Curl_handler Curl_handler_smbs; | |
| - | #endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && |
| - | SIZEOF_CURL_OFF_T > 4 */ |
| + | #endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && SIZEOF_CURL_OFF_T > 4 */ |
| #endif /* HEADER_CURL_SMB_H */ | |
lib/socks.c+1 -1
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if !defined(CURL_DISABLE_PROXY) |
| + | #ifndef CURL_DISABLE_PROXY |
| #ifdef HAVE_NETINET_IN_H | |
| #include <netinet/in.h> | |
lib/url.c+4 -4
| @@ -3202,8 +3202,8 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data, | |
| &as /* to */, | |
| allowed_alpns); | |
| } | |
| - | #endif |
| - | #ifdef USE_HTTP2 |
| + | #endif |
| + | #ifdef USE_HTTP2 |
| if(!hit && (neg->wanted & CURL_HTTP_V2x) && | |
| !neg->h2_prior_knowledge) { | |
| srcalpnid = ALPN_h2; | |
| @@ -3212,7 +3212,7 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data, | |
| &as /* to */, | |
| allowed_alpns); | |
| } | |
| - | #endif |
| + | #endif |
| if(!hit && (neg->wanted & CURL_HTTP_V1x) && | |
| !neg->only_10) { | |
| srcalpnid = ALPN_h1; | |
| @@ -4089,7 +4089,7 @@ void Curl_data_priority_clear_state(struct Curl_easy *data) | |
| memset(&data->state.priority, 0, sizeof(data->state.priority)); | |
| } | |
| - | #endif /* defined(USE_HTTP2) || defined(USE_HTTP3) */ |
| + | #endif /* USE_HTTP2 || USE_HTTP3 */ |
| CURLcode Curl_conn_meta_set(struct connectdata *conn, const char *key, | |
lib/url.h+1 -1
| @@ -118,7 +118,7 @@ CURLcode Curl_1st_fatal(CURLcode r1, CURLcode r2); | |
| void Curl_data_priority_clear_state(struct Curl_easy *data); | |
| #else | |
| #define Curl_data_priority_clear_state(x) | |
| - | #endif /* !(defined(USE_HTTP2) || defined(USE_HTTP3)) */ |
| + | #endif /* USE_HTTP2 || USE_HTTP3 */ |
| #ifdef USE_NGHTTP2 | |
| CURLcode Curl_data_priority_add_child(struct Curl_easy *parent, | |
lib/urldata.h+5 -5
| @@ -317,7 +317,7 @@ struct ssl_general_config { | |
| #ifndef CURL_DISABLE_DIGEST_AUTH | |
| /* Struct used for Digest challenge-response authentication */ | |
| struct digestdata { | |
| - | #if defined(USE_WINDOWS_SSPI) |
| + | #ifdef USE_WINDOWS_SSPI |
| BYTE *input_token; | |
| size_t input_token_len; | |
| CtxtHandle *http_context; | |
| @@ -745,7 +745,7 @@ struct connectdata { | |
| CtxtHandle *sslContext; | |
| #endif | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| curlntlm http_ntlm_state; | |
| curlntlm proxy_ntlm_state; | |
| #endif | |
| @@ -1052,7 +1052,7 @@ struct UrlState { | |
| struct Curl_async async; /* asynchronous name resolver data */ | |
| #endif | |
| - | #if defined(USE_OPENSSL) |
| + | #ifdef USE_OPENSSL |
| /* void instead of ENGINE to avoid bleeding OpenSSL into this header */ | |
| void *engine; | |
| /* void instead of OSSL_PROVIDER */ | |
| @@ -1254,7 +1254,7 @@ enum dupstring { | |
| STRING_FTP_ALTERNATIVE_TO_USER, /* command to send if USER/PASS fails */ | |
| STRING_FTPPORT, /* port to send with the FTP PORT command */ | |
| #endif | |
| - | #if defined(HAVE_GSSAPI) |
| + | #ifdef HAVE_GSSAPI |
| STRING_KRB_LEVEL, /* krb security level */ | |
| #endif | |
| #ifndef CURL_DISABLE_NETRC | |
| @@ -1619,7 +1619,7 @@ struct UserDefined { | |
| location: */ | |
| BIT(opt_no_body); /* as set with CURLOPT_NOBODY */ | |
| BIT(verbose); /* output verbosity */ | |
| - | #if defined(HAVE_GSSAPI) |
| + | #ifdef HAVE_GSSAPI |
| BIT(krb); /* Kerberos connection requested */ | |
| #endif | |
| BIT(reuse_forbid); /* forbidden to be reused, close after use */ | |
lib/vauth/digest_sspi.c+4 -4
| @@ -203,7 +203,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, | |
| status == SEC_I_COMPLETE_AND_CONTINUE) | |
| Curl_pSecFn->CompleteAuthToken(&credentials, &resp_desc); | |
| else if(status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) { | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| char buffer[STRERROR_LEN]; | |
| #endif | |
| @@ -215,7 +215,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, | |
| if(status == SEC_E_INSUFFICIENT_MEMORY) | |
| return CURLE_OUT_OF_MEMORY; | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| infof(data, "schannel: InitializeSecurityContext failed: %s", | |
| Curl_sspi_strerror(status, buffer, sizeof(buffer))); | |
| #endif | |
| @@ -602,7 +602,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, | |
| status == SEC_I_COMPLETE_AND_CONTINUE) | |
| Curl_pSecFn->CompleteAuthToken(&credentials, &resp_desc); | |
| else if(status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) { | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| char buffer[STRERROR_LEN]; | |
| #endif | |
| @@ -616,7 +616,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, | |
| if(status == SEC_E_INSUFFICIENT_MEMORY) | |
| return CURLE_OUT_OF_MEMORY; | |
| - | #if !defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifndef CURL_DISABLE_VERBOSE_STRINGS |
| infof(data, "schannel: InitializeSecurityContext failed: %s", | |
| Curl_sspi_strerror(status, buffer, sizeof(buffer))); | |
| #endif | |
lib/vauth/krb5_sspi.c+1 -1
| @@ -270,7 +270,7 @@ CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data, | |
| SecPkgContext_Sizes sizes; | |
| SECURITY_STATUS status; | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #endif | |
lib/vauth/ntlm.c+2 -2
| @@ -268,7 +268,7 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data, | |
| const unsigned char *type2 = Curl_bufref_ptr(type2ref); | |
| size_t type2len = Curl_bufref_len(type2ref); | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #endif | |
| @@ -368,7 +368,7 @@ CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data, | |
| const unsigned char *type2 = Curl_bufref_ptr(type2ref); | |
| size_t type2len = Curl_bufref_len(type2ref); | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #endif | |
lib/vauth/ntlm_sspi.c+2 -2
| @@ -205,7 +205,7 @@ CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data, | |
| const struct bufref *type2, | |
| struct ntlmdata *ntlm) | |
| { | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #endif | |
| @@ -257,7 +257,7 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, | |
| unsigned long attrs; | |
| TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */ | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #endif | |
| (void)passwdp; | |
lib/vauth/spnego_sspi.c+1 -1
| @@ -107,7 +107,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, | |
| unsigned long attrs; | |
| TimeStamp expiry; /* For Windows 9x compatibility of SSPI calls */ | |
| - | #if defined(CURL_DISABLE_VERBOSE_STRINGS) |
| + | #ifdef CURL_DISABLE_VERBOSE_STRINGS |
| (void)data; | |
| #endif | |
lib/vauth/vauth.c+1 -1
| @@ -54,7 +54,7 @@ | |
| * | |
| * Returns a pointer to the newly allocated SPN. | |
| */ | |
| - | #if !defined(USE_WINDOWS_SSPI) |
| + | #ifndef USE_WINDOWS_SSPI |
| char *Curl_auth_build_spn(const char *service, const char *host, | |
| const char *realm) | |
| { | |
lib/vauth/vauth.h+7 -7
| @@ -32,11 +32,11 @@ | |
| struct Curl_easy; | |
| struct connectdata; | |
| - | #if !defined(CURL_DISABLE_DIGEST_AUTH) |
| + | #ifndef CURL_DISABLE_DIGEST_AUTH |
| struct digestdata; | |
| #endif | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| struct ntlmdata; | |
| #endif | |
| @@ -44,7 +44,7 @@ struct ntlmdata; | |
| struct negotiatedata; | |
| #endif | |
| - | #if defined(USE_GSASL) |
| + | #ifdef USE_GSASL |
| struct gsasldata; | |
| #endif | |
| @@ -60,7 +60,7 @@ struct gsasldata; | |
| bool Curl_auth_allowed_to_host(struct Curl_easy *data); | |
| /* This is used to build an SPN string */ | |
| - | #if !defined(USE_WINDOWS_SSPI) |
| + | #ifndef USE_WINDOWS_SSPI |
| char *Curl_auth_build_spn(const char *service, const char *host, | |
| const char *realm); | |
| #else | |
| @@ -153,7 +153,7 @@ CURLcode Curl_auth_gsasl_token(struct Curl_easy *data, | |
| void Curl_auth_gsasl_cleanup(struct gsasldata *digest); | |
| #endif | |
| - | #if defined(USE_NTLM) |
| + | #ifdef USE_NTLM |
| /* meta key for storing NTML meta at connection */ | |
| #define CURL_META_NTLM_CONN "meta:auth:ntml:conn" | |
| @@ -231,7 +231,7 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user, | |
| const char *bearer, | |
| struct bufref *out); | |
| - | #if defined(USE_KERBEROS5) |
| + | #ifdef USE_KERBEROS5 |
| #ifdef HAVE_GSSAPI | |
| # ifdef HAVE_GSSGNU | |
| @@ -250,7 +250,7 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user, | |
| #define CURL_META_KRB5_CONN "meta:auth:krb5:conn" | |
| struct kerberos5data { | |
| - | #if defined(USE_WINDOWS_SSPI) |
| + | #ifdef USE_WINDOWS_SSPI |
| CredHandle *credentials; | |
| CtxtHandle *context; | |
| TCHAR *spn; | |
lib/version.c+5 -5
| @@ -498,7 +498,7 @@ static const struct feat features_table[] = { | |
| !defined(CURL_DISABLE_HTTP) | |
| FEATURE("HTTPS-proxy", https_proxy_present, CURL_VERSION_HTTPS_PROXY), | |
| #endif | |
| - | #if defined(USE_HTTPSRR) |
| + | #ifdef USE_HTTPSRR |
| FEATURE("HTTPSRR", NULL, 0), | |
| #endif | |
| #if defined(USE_LIBIDN2) || defined(USE_WIN32_IDN) || defined(USE_APPLE_IDN) | |
| @@ -523,7 +523,7 @@ static const struct feat features_table[] = { | |
| #ifdef USE_NTLM | |
| FEATURE("NTLM", NULL, CURL_VERSION_NTLM), | |
| #endif | |
| - | #if defined(USE_LIBPSL) |
| + | #ifdef USE_LIBPSL |
| FEATURE("PSL", NULL, CURL_VERSION_PSL), | |
| #endif | |
| #ifdef USE_SPNEGO | |
| @@ -532,7 +532,7 @@ static const struct feat features_table[] = { | |
| #ifdef USE_SSL | |
| FEATURE("SSL", NULL, CURL_VERSION_SSL), | |
| #endif | |
| - | #if defined(USE_SSLS_EXPORT) |
| + | #ifdef USE_SSLS_EXPORT |
| FEATURE("SSLS-EXPORT", NULL, 0), | |
| #endif | |
| #ifdef USE_WINDOWS_SSPI | |
| @@ -607,7 +607,7 @@ curl_version_info_data *curl_version_info(CURLversion stamp) | |
| const struct feat *p; | |
| int features = 0; | |
| - | #if defined(USE_SSH) |
| + | #ifdef USE_SSH |
| static char ssh_buf[80]; /* 'ssh_buffer' clashes with libssh/libssh.h */ | |
| #endif | |
| #ifdef USE_SSL | |
| @@ -648,7 +648,7 @@ curl_version_info_data *curl_version_info(CURLversion stamp) | |
| version_info.libidn = idn2_check_version(IDN2_VERSION); | |
| #endif | |
| - | #if defined(USE_SSH) |
| + | #ifdef USE_SSH |
| Curl_ssh_version(ssh_buf, sizeof(ssh_buf)); | |
| version_info.libssh_version = ssh_buf; | |
| #endif | |
lib/vquic/curl_osslq.c+4 -4
| @@ -119,15 +119,15 @@ static const char *osslq_SSL_ERROR_to_str(int err) | |
| return "SSL_ERROR_WANT_CONNECT"; | |
| case SSL_ERROR_WANT_ACCEPT: | |
| return "SSL_ERROR_WANT_ACCEPT"; | |
| - | #if defined(SSL_ERROR_WANT_ASYNC) |
| + | #ifdef SSL_ERROR_WANT_ASYNC |
| case SSL_ERROR_WANT_ASYNC: | |
| return "SSL_ERROR_WANT_ASYNC"; | |
| #endif | |
| - | #if defined(SSL_ERROR_WANT_ASYNC_JOB) |
| + | #ifdef SSL_ERROR_WANT_ASYNC_JOB |
| case SSL_ERROR_WANT_ASYNC_JOB: | |
| return "SSL_ERROR_WANT_ASYNC_JOB"; | |
| #endif | |
| - | #if defined(SSL_ERROR_WANT_EARLY) |
| + | #ifdef SSL_ERROR_WANT_EARLY |
| case SSL_ERROR_WANT_EARLY: | |
| return "SSL_ERROR_WANT_EARLY"; | |
| #endif | |
| @@ -514,7 +514,7 @@ static CURLcode cf_osslq_ssl_err(struct Curl_cfilter *cf, | |
| else | |
| err_descr = "SSL certificate verification failed"; | |
| } | |
| - | #if defined(SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED) |
| + | #ifdef SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED |
| /* SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED is only available on | |
| OpenSSL version above v1.1.1, not LibreSSL, BoringSSL, or AWS-LC */ | |
| else if((lib == ERR_LIB_SSL) && | |
lib/vquic/vquic.c+1 -1
| @@ -612,7 +612,7 @@ CURLcode vquic_recv_packets(struct Curl_cfilter *cf, | |
| vquic_recv_pkt_cb *recv_cb, void *userp) | |
| { | |
| CURLcode result; | |
| - | #if defined(HAVE_SENDMMSG) |
| + | #ifdef HAVE_SENDMMSG |
| result = recvmmsg_packets(cf, data, qctx, max_pkts, recv_cb, userp); | |
| #elif defined(HAVE_SENDMSG) | |
| result = recvmsg_packets(cf, data, qctx, max_pkts, recv_cb, userp); | |
lib/vssh/curl_path.c+1 -1
| @@ -24,7 +24,7 @@ | |
| #include "../curl_setup.h" | |
| - | #if defined(USE_SSH) |
| + | #ifdef USE_SSH |
| #include "curl_path.h" | |
| #include <curl/curl.h> | |
lib/vssh/ssh.h+3 -3
| @@ -26,7 +26,7 @@ | |
| #include "../curl_setup.h" | |
| - | #if defined(USE_LIBSSH2) |
| + | #ifdef USE_LIBSSH2 |
| #include <libssh2.h> | |
| #include <libssh2_sftp.h> | |
| #elif defined(USE_LIBSSH) | |
| @@ -162,7 +162,7 @@ struct ssh_conn { | |
| int orig_waitfor; /* default READ/WRITE bits wait for */ | |
| char *slash_pos; /* used by the SFTP_CREATE_DIRS state */ | |
| - | #if defined(USE_LIBSSH) |
| + | #ifdef USE_LIBSSH |
| CURLcode actualcode; /* the actual error code */ | |
| char *readdir_linkPath; | |
| size_t readdir_len; | |
| @@ -228,7 +228,7 @@ struct ssh_conn { | |
| #endif | |
| #endif | |
| - | #if defined(USE_LIBSSH2) |
| + | #ifdef USE_LIBSSH2 |
| /* Feature detection based on version numbers to better work with | |
| non-configure platforms */ | |
lib/vtls/cipher_suite.c+6 -6
| @@ -80,7 +80,7 @@ static const char *cs_txt = | |
| "SHA" "\0" | |
| "SHA256" "\0" | |
| "SHA384" "\0" | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| "ARIA" "\0" | |
| "ARIA128" "\0" | |
| "ARIA256" "\0" | |
| @@ -121,7 +121,7 @@ enum { | |
| CS_TXT_IDX_SHA, | |
| CS_TXT_IDX_SHA256, | |
| CS_TXT_IDX_SHA384, | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| CS_TXT_IDX_ARIA, | |
| CS_TXT_IDX_ARIA128, | |
| CS_TXT_IDX_ARIA256, | |
| @@ -180,7 +180,7 @@ static const struct cs_entry cs_list [] = { | |
| CS_ENTRY(0xCCA8, ECDHE,RSA,CHACHA20,POLY1305,,,,), | |
| CS_ENTRY(0xCCA9, TLS,ECDHE,ECDSA,WITH,CHACHA20,POLY1305,SHA256,), | |
| CS_ENTRY(0xCCA9, ECDHE,ECDSA,CHACHA20,POLY1305,,,,), | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| CS_ENTRY(0x002F, TLS,RSA,WITH,AES,128,CBC,SHA,), | |
| CS_ENTRY(0x002F, AES128,SHA,,,,,,), | |
| CS_ENTRY(0x0035, TLS,RSA,WITH,AES,256,CBC,SHA,), | |
| @@ -234,7 +234,7 @@ static const struct cs_entry cs_list [] = { | |
| CS_ENTRY(0xC032, TLS,ECDH,RSA,WITH,AES,256,GCM,SHA384), | |
| CS_ENTRY(0xC032, ECDH,RSA,AES256,GCM,SHA384,,,), | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| CS_ENTRY(0x0001, TLS,RSA,WITH,NULL,MD5,,,), | |
| CS_ENTRY(0x0001, NULL,MD5,,,,,,), | |
| CS_ENTRY(0x0002, TLS,RSA,WITH,NULL,SHA,,,), | |
| @@ -322,7 +322,7 @@ static const struct cs_entry cs_list [] = { | |
| CS_ENTRY(0xCCAB, TLS,PSK,WITH,CHACHA20,POLY1305,SHA256,,), | |
| CS_ENTRY(0xCCAB, PSK,CHACHA20,POLY1305,,,,,), | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| CS_ENTRY(0xC09C, TLS,RSA,WITH,AES,128,CCM,,), | |
| CS_ENTRY(0xC09C, AES128,CCM,,,,,,), | |
| CS_ENTRY(0xC09D, TLS,RSA,WITH,AES,256,CCM,,), | |
| @@ -340,7 +340,7 @@ static const struct cs_entry cs_list [] = { | |
| CS_ENTRY(0xC0AF, TLS,ECDHE,ECDSA,WITH,AES,256,CCM,8), | |
| CS_ENTRY(0xC0AF, ECDHE,ECDSA,AES256,CCM8,,,,), | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| /* entries marked ns are "non-standard", they are not in OpenSSL */ | |
| CS_ENTRY(0x0041, TLS,RSA,WITH,CAMELLIA,128,CBC,SHA,), | |
| CS_ENTRY(0x0041, CAMELLIA128,SHA,,,,,,), | |
lib/vtls/gtls.c+3 -3
| @@ -892,15 +892,15 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf, | |
| * on QUIC this is common. */ | |
| init_flags |= GNUTLS_ENABLE_EARLY_DATA; | |
| - | #if defined(GNUTLS_FORCE_CLIENT_CERT) |
| + | #ifdef GNUTLS_FORCE_CLIENT_CERT |
| init_flags |= GNUTLS_FORCE_CLIENT_CERT; | |
| #endif | |
| - | #if defined(GNUTLS_NO_TICKETS_TLS12) |
| + | #ifdef GNUTLS_NO_TICKETS_TLS12 |
| init_flags |= GNUTLS_NO_TICKETS_TLS12; | |
| #endif | |
| - | #if defined(GNUTLS_NO_STATUS_REQUEST) |
| + | #ifdef GNUTLS_NO_STATUS_REQUEST |
| if(!config->verifystatus) | |
| /* Disable the "status_request" TLS extension, enabled by default since | |
| GnuTLS 3.8.0. */ | |
lib/vtls/mbedtls.c+3 -3
| @@ -880,12 +880,12 @@ mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| - | #if defined(MBEDTLS_SSL_RENEGOTIATION) |
| + | #ifdef MBEDTLS_SSL_RENEGOTIATION |
| mbedtls_ssl_conf_renegotiation(&backend->config, | |
| MBEDTLS_SSL_RENEGOTIATION_ENABLED); | |
| #endif | |
| - | #if defined(MBEDTLS_SSL_SESSION_TICKETS) |
| + | #ifdef MBEDTLS_SSL_SESSION_TICKETS |
| mbedtls_ssl_conf_session_tickets(&backend->config, | |
| MBEDTLS_SSL_SESSION_TICKETS_DISABLED); | |
| #endif | |
| @@ -1426,7 +1426,7 @@ static size_t mbedtls_version(char *buffer, size_t size) | |
| static CURLcode mbedtls_random(struct Curl_easy *data, | |
| unsigned char *entropy, size_t length) | |
| { | |
| - | #if defined(MBEDTLS_CTR_DRBG_C) |
| + | #ifdef MBEDTLS_CTR_DRBG_C |
| int ret; | |
| mbedtls_entropy_context ctr_entropy; | |
| mbedtls_ctr_drbg_context ctr_drbg; | |
lib/vtls/openssl.c+4 -4
| @@ -1124,7 +1124,7 @@ static bool is_pkcs11_uri(const char *string) | |
| #endif | |
| static CURLcode ossl_set_engine(struct Curl_easy *data, const char *engine); | |
| - | #if defined(OPENSSL_HAS_PROVIDERS) |
| + | #ifdef OPENSSL_HAS_PROVIDERS |
| static CURLcode ossl_set_provider(struct Curl_easy *data, | |
| const char *provider); | |
| #endif | |
| @@ -1378,7 +1378,7 @@ int cert_stuff(struct Curl_easy *data, | |
| } | |
| break; | |
| #endif | |
| - | #if defined(OPENSSL_HAS_PROVIDERS) |
| + | #ifdef OPENSSL_HAS_PROVIDERS |
| /* fall through to compatible provider */ | |
| case SSL_FILETYPE_PROVIDER: | |
| { | |
| @@ -1631,7 +1631,7 @@ fail: | |
| } | |
| break; | |
| #endif | |
| - | #if defined(OPENSSL_HAS_PROVIDERS) |
| + | #ifdef OPENSSL_HAS_PROVIDERS |
| /* fall through to compatible provider */ | |
| case SSL_FILETYPE_PROVIDER: | |
| { | |
| @@ -1967,7 +1967,7 @@ static struct curl_slist *ossl_engines_list(struct Curl_easy *data) | |
| return list; | |
| } | |
| - | #if defined(OPENSSL_HAS_PROVIDERS) |
| + | #ifdef OPENSSL_HAS_PROVIDERS |
| static void ossl_provider_cleanup(struct Curl_easy *data) | |
| { | |
lib/vtls/rustls.c+3 -3
| @@ -583,7 +583,7 @@ init_config_builder(struct Curl_easy *data, | |
| goto cleanup; | |
| } | |
| - | #if defined(USE_ECH) |
| + | #ifdef USE_ECH |
| if(ECH_ENABLED(data)) { | |
| tls_versions[0] = RUSTLS_TLS_VERSION_TLSV1_3; | |
| tls_versions_len = 1; | |
| @@ -918,7 +918,7 @@ cleanup: | |
| return result; | |
| } | |
| - | #if defined(USE_ECH) |
| + | #ifdef USE_ECH |
| static CURLcode | |
| init_config_builder_ech(struct Curl_easy *data, | |
| const struct ssl_connect_data *connssl, | |
| @@ -1077,7 +1077,7 @@ cr_init_backend(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| } | |
| } | |
| - | #if defined(USE_ECH) |
| + | #ifdef USE_ECH |
| if(ECH_ENABLED(data)) { | |
| result = init_config_builder_ech(data, connssl, config_builder); | |
| if(result != CURLE_OK && data->set.tls_ech & CURLECH_HARD) { | |
lib/vtls/schannel.h+2 -2
| @@ -37,7 +37,7 @@ | |
| #pragma warning(pop) | |
| #endif | |
| /* Wincrypt must be included before anything that could include OpenSSL. */ | |
| - | #if defined(USE_WIN32_CRYPTO) |
| + | #ifdef USE_WIN32_CRYPTO |
| #include <wincrypt.h> | |
| /* Undefine wincrypt conflicting symbols for BoringSSL. */ | |
| #undef X509_NAME | |
| @@ -68,7 +68,7 @@ | |
| * BoringSSL's <openssl/x509.h>: So just undefine those defines here | |
| * (and only here). | |
| */ | |
| - | #if defined(OPENSSL_IS_BORINGSSL) |
| + | #ifdef OPENSSL_IS_BORINGSSL |
| # undef X509_NAME | |
| # undef X509_CERT_PAIR | |
| # undef X509_EXTENSIONS | |
lib/vtls/schannel_verify.c+2 -2
| @@ -390,7 +390,7 @@ static DWORD cert_get_name_string(struct Curl_easy *data, | |
| BOOL Win8_compat) | |
| { | |
| DWORD actual_length = 0; | |
| - | #if defined(CURL_WINDOWS_UWP) |
| + | #ifdef CURL_WINDOWS_UWP |
| (void)data; | |
| (void)cert_context; | |
| (void)host_names; | |
| @@ -510,7 +510,7 @@ static bool get_alt_name_info(struct Curl_easy *data, | |
| LPDWORD alt_name_info_size) | |
| { | |
| bool result = FALSE; | |
| - | #if defined(CURL_WINDOWS_UWP) |
| + | #ifdef CURL_WINDOWS_UWP |
| (void)data; | |
| (void)ctx; | |
| (void)alt_name_info; | |
lib/vtls/vtls.c+9 -9
| @@ -972,7 +972,7 @@ static const struct Curl_ssl Curl_ssl_multi = { | |
| }; | |
| const struct Curl_ssl *Curl_ssl = | |
| - | #if defined(CURL_WITH_MULTI_SSL) |
| + | #ifdef CURL_WITH_MULTI_SSL |
| &Curl_ssl_multi; | |
| #elif defined(USE_WOLFSSL) | |
| &Curl_ssl_wolfssl; | |
| @@ -991,22 +991,22 @@ const struct Curl_ssl *Curl_ssl = | |
| #endif | |
| static const struct Curl_ssl *available_backends[] = { | |
| - | #if defined(USE_WOLFSSL) |
| + | #ifdef USE_WOLFSSL |
| &Curl_ssl_wolfssl, | |
| #endif | |
| - | #if defined(USE_GNUTLS) |
| + | #ifdef USE_GNUTLS |
| &Curl_ssl_gnutls, | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| &Curl_ssl_mbedtls, | |
| #endif | |
| - | #if defined(USE_OPENSSL) |
| + | #ifdef USE_OPENSSL |
| &Curl_ssl_openssl, | |
| #endif | |
| - | #if defined(USE_SCHANNEL) |
| + | #ifdef USE_SCHANNEL |
| &Curl_ssl_schannel, | |
| #endif | |
| - | #if defined(USE_RUSTLS) |
| + | #ifdef USE_RUSTLS |
| &Curl_ssl_rustls, | |
| #endif | |
| NULL | |
| @@ -1019,7 +1019,7 @@ void Curl_ssl_cleanup(void) | |
| /* only cleanup if we did a previous init */ | |
| if(Curl_ssl->cleanup) | |
| Curl_ssl->cleanup(); | |
| - | #if defined(CURL_WITH_MULTI_SSL) |
| + | #ifdef CURL_WITH_MULTI_SSL |
| Curl_ssl = &Curl_ssl_multi; | |
| #endif | |
| init_ssl = FALSE; | |
| @@ -1124,7 +1124,7 @@ CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name, | |
| return id == Curl_ssl->info.id || | |
| (name && curl_strequal(name, Curl_ssl->info.name)) ? | |
| CURLSSLSET_OK : | |
| - | #if defined(CURL_WITH_MULTI_SSL) |
| + | #ifdef CURL_WITH_MULTI_SSL |
| CURLSSLSET_TOO_LATE; | |
| #else | |
| CURLSSLSET_UNKNOWN_BACKEND; | |
lib/vtls/wolfssl.c+1 -1
| @@ -178,7 +178,7 @@ wssl_tls13_secret_callback(SSL *ssl, int id, const unsigned char *secret, | |
| Curl_tls_keylog_write(label, client_random, secret, secretSz); | |
| return 0; | |
| } | |
| - | #endif /* defined(HAVE_SECRET_CALLBACK) && defined(WOLFSSL_TLS13) */ |
| + | #endif /* HAVE_SECRET_CALLBACK && WOLFSSL_TLS13 */ |
| static void wssl_log_tls12_secret(WOLFSSL *ssl) | |
| { | |
m4/curl-functions.m4+1 -1
| @@ -407,7 +407,7 @@ dnl included when bsdsocket.h is to be included. | |
| AC_DEFUN([CURL_INCLUDES_BSDSOCKET], [ | |
| curl_includes_bsdsocket="\ | |
| /* includes start */ | |
| - | #if defined(HAVE_PROTO_BSDSOCKET_H) |
| + | #ifdef HAVE_PROTO_BSDSOCKET_H |
| # define __NO_NET_API | |
| # define __USE_INLINE__ | |
| # include <proto/bsdsocket.h> | |
scripts/schemetable.c+1 -1
| @@ -61,7 +61,7 @@ static const struct detail scheme[] = { | |
| {"rtmpts", "#ifdef USE_LIBRTMP" }, | |
| {"rtsp", "#ifndef CURL_DISABLE_RTSP" }, | |
| {"scp", "#if defined(USE_SSH) && !defined(USE_WOLFSSH)" }, | |
| - | {"sftp", "#if defined(USE_SSH)" }, |
| + | {"sftp", "#ifdef USE_SSH" }, |
| {"smb", "#if !defined(CURL_DISABLE_SMB) && \\\n" | |
| " defined(USE_CURL_NTLM_CORE) && (SIZEOF_CURL_OFF_T > 4)" }, | |
| {"smbs", "#if defined(USE_SSL) && !defined(CURL_DISABLE_SMB) && \\\n" | |
src/tool_cb_rea.c+4 -4
| @@ -71,12 +71,12 @@ 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(per->infd, &bits); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(!select(per->infd + 1, &bits, NULL, NULL, &timeout)) | |
| @@ -161,12 +161,12 @@ int tool_readbusy_cb(void *clientp, | |
| timeout.tv_usec = 1000; | |
| FD_ZERO(&bits); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(per->infd, &bits); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| select(per->infd + 1, &bits, NULL, NULL, &timeout); | |
src/tool_filetime.c+1 -1
| @@ -151,4 +151,4 @@ void setfiletime(curl_off_t filetime, const char *filename, | |
| #endif | |
| } | |
| } | |
| - | #endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) || defined(_WIN32) */ |
| + | #endif /* HAVE_UTIME || HAVE_UTIMES || _WIN32 */ |
src/tool_filetime.h+2 -3
| @@ -30,13 +30,12 @@ struct GlobalConfig; | |
| int getfiletime(const char *filename, struct GlobalConfig *global, | |
| curl_off_t *stamp); | |
| - | #if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \ |
| + | #if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \ |
| (defined(_WIN32) && (SIZEOF_CURL_OFF_T >= 8)) | |
| void setfiletime(curl_off_t filetime, const char *filename, | |
| struct GlobalConfig *global); | |
| #else | |
| #define setfiletime(a,b,c) tool_nop_stmt | |
| - | #endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \ |
| - | (defined(_WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */ |
| + | #endif |
| #endif /* HEADER_CURL_TOOL_FILETIME_H */ | |
src/tool_main.c+2 -2
| @@ -61,8 +61,8 @@ | |
| int vms_show = 0; | |
| #endif | |
| - | #if defined(__AMIGA__) |
| - | #if defined(__GNUC__) |
| + | #ifdef __AMIGA__ |
| + | #ifdef __GNUC__ |
| #define CURL_USED __attribute__((used)) | |
| #else | |
| #define CURL_USED | |
src/tool_operate.c+1 -1
| @@ -2104,7 +2104,7 @@ static CURLcode cacertpaths(struct OperationConfig *config) | |
| #ifdef _WIN32 | |
| if(!env) { | |
| - | #if defined(CURL_CA_SEARCH_SAFE) |
| + | #ifdef CURL_CA_SEARCH_SAFE |
| char *cacert = NULL; | |
| FILE *cafile = tool_execpath("curl-ca-bundle.crt", &cacert); | |
| if(cafile) { | |
tests/http/testenv/mod_curltest/mod_curltest.c+1 -1
| @@ -51,7 +51,7 @@ AP_DECLARE_MODULE(curltest) = | |
| NULL, /* func to merge per server config */ | |
| NULL, /* command handlers */ | |
| curltest_hooks, | |
| - | #if defined(AP_MODULE_FLAG_NONE) |
| + | #ifdef AP_MODULE_FLAG_NONE |
| AP_MODULE_FLAG_ALWAYS_MERGE | |
| #endif | |
| }; | |
tests/libtest/lib1960.c+1 -1
| @@ -64,7 +64,7 @@ static int sockopt_cb(void *clientp, | |
| return CURL_SOCKOPT_ALREADY_CONNECTED; | |
| } | |
| - | #if defined(__AMIGA__) |
| + | #ifdef __AMIGA__ |
| #define my_inet_pton(x,y,z) inet_pton(x,(unsigned char *)y,z) | |
| #else | |
| #define my_inet_pton(x,y,z) inet_pton(x,y,z) | |
tests/libtest/lib3207.c+1 -1
| @@ -25,7 +25,7 @@ | |
| #include "memdebug.h" | |
| - | #if defined(USE_THREADS_POSIX) |
| + | #ifdef USE_THREADS_POSIX |
| #include <pthread.h> | |
| #endif | |
tests/libtest/lib518.c+2 -2
| @@ -471,7 +471,7 @@ test_cleanup: | |
| return res; | |
| } | |
| - | #else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */ |
| + | #else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */ |
| static CURLcode test_lib518(char *URL) | |
| { | |
| @@ -480,4 +480,4 @@ static CURLcode test_lib518(char *URL) | |
| return TEST_ERR_MAJOR_BAD; /* skip test */ | |
| } | |
| - | #endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */ |
| + | #endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */ |
tests/libtest/lib530.c+2 -2
| @@ -235,12 +235,12 @@ static void t530_updateFdSet(struct t530_Sockets *sockets, fd_set* fdset, | |
| { | |
| int i; | |
| for(i = 0; i < sockets->count; ++i) { | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockets->sockets[i], fdset); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(*maxFd < sockets->sockets[i] + 1) { | |
tests/libtest/lib537.c+2 -2
| @@ -485,7 +485,7 @@ test_cleanup: | |
| return res; | |
| } | |
| - | #else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */ |
| + | #else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */ |
| static CURLcode test_lib537(char *URL) | |
| { | |
| @@ -494,4 +494,4 @@ static CURLcode test_lib537(char *URL) | |
| return TEST_ERR_MAJOR_BAD; /* skip test */ | |
| } | |
| - | #endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */ |
| + | #endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */ |
tests/libtest/lib582.c+2 -2
| @@ -182,12 +182,12 @@ static void t582_updateFdSet(struct t582_Sockets *sockets, fd_set* fdset, | |
| { | |
| int i; | |
| for(i = 0; i < sockets->count; ++i) { | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockets->sockets[i], fdset); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(*maxFd < sockets->sockets[i] + 1) { | |
tests/server/mqttd.c+2 -2
| @@ -666,12 +666,12 @@ static bool mqttd_incoming(curl_socket_t listenfd) | |
| FD_ZERO(&fds_err); | |
| /* there's always a socket to wait for */ | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockfd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
tests/server/resolve.c+5 -5
| @@ -42,7 +42,7 @@ static int test_resolve(int argc, char *argv[]) | |
| while(argc > arg) { | |
| if(!strcmp("--version", argv[arg])) { | |
| printf("resolve IPv4%s\n", | |
| - | #if defined(CURLRES_IPV6) |
| + | #ifdef CURLRES_IPV6 |
| "/IPv6" | |
| #else | |
| "" | |
| @@ -51,7 +51,7 @@ static int test_resolve(int argc, char *argv[]) | |
| return 0; | |
| } | |
| else if(!strcmp("--ipv6", argv[arg])) { | |
| - | #if defined(CURLRES_IPV6) |
| + | #ifdef CURLRES_IPV6 |
| ipv_inuse = "IPv6"; | |
| use_ipv6 = TRUE; | |
| arg++; | |
| @@ -63,7 +63,7 @@ static int test_resolve(int argc, char *argv[]) | |
| else if(!strcmp("--ipv4", argv[arg])) { | |
| /* for completeness, we support this option as well */ | |
| ipv_inuse = "IPv4"; | |
| - | #if defined(CURLRES_IPV6) |
| + | #ifdef CURLRES_IPV6 |
| use_ipv6 = FALSE; | |
| #endif | |
| arg++; | |
| @@ -76,7 +76,7 @@ static int test_resolve(int argc, char *argv[]) | |
| puts("Usage: resolve [option] <host>\n" | |
| " --version\n" | |
| " --ipv4" | |
| - | #if defined(CURLRES_IPV6) |
| + | #ifdef CURLRES_IPV6 |
| "\n --ipv6" | |
| #endif | |
| ); | |
| @@ -88,7 +88,7 @@ static int test_resolve(int argc, char *argv[]) | |
| return 2; | |
| #endif | |
| - | #if defined(CURLRES_IPV6) |
| + | #ifdef CURLRES_IPV6 |
| if(use_ipv6) { | |
| /* Check that the system has IPv6 enabled before checking the resolver */ | |
| curl_socket_t s = socket(PF_INET6, SOCK_DGRAM, 0); | |
tests/server/sockfilt.c+8 -8
| @@ -965,12 +965,12 @@ static bool juggle(curl_socket_t *sockfdp, | |
| FD_ZERO(&fds_write); | |
| FD_ZERO(&fds_err); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET((curl_socket_t)fileno(stdin), &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| @@ -981,12 +981,12 @@ static bool juggle(curl_socket_t *sockfdp, | |
| /* server mode */ | |
| sockfd = listenfd; | |
| /* there's always a socket to wait for */ | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockfd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| maxfd = (int)sockfd; | |
| @@ -1002,12 +1002,12 @@ static bool juggle(curl_socket_t *sockfdp, | |
| } | |
| else { | |
| /* there's always a socket to wait for */ | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockfd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| maxfd = (int)sockfd; | |
| @@ -1019,12 +1019,12 @@ 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockfd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| maxfd = (int)sockfd; | |
tests/server/socksd.c+6 -6
| @@ -629,35 +629,35 @@ static bool socksd_incoming(curl_socket_t listenfd) | |
| FD_ZERO(&fds_err); | |
| /* there's always a socket to wait for */ | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sockfd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(fd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if((int)fd > maxfd) | |
| maxfd = (int)fd; | |
| fd = c[i].remotefd; | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(fd, &fds_read); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if((int)fd > maxfd) | |
tests/server/sws.c+16 -16
| @@ -830,12 +830,12 @@ static int sws_get_request(curl_socket_t sock, struct sws_httprequest *req) | |
| FD_ZERO(&input); | |
| FD_ZERO(&output); | |
| got = 0; | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(sock, &input); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| do { | |
| @@ -1307,12 +1307,12 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port) | |
| timeout.tv_sec = 1; /* 1000 ms */ | |
| FD_ZERO(&output); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(serverfd, &output); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| while(1) { | |
| @@ -1439,12 +1439,12 @@ 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(rootfd, &input); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| maxfd = rootfd; | |
| @@ -1456,12 +1456,12 @@ 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(clientfd[i], &input); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(clientfd[i] > maxfd) | |
| @@ -1470,12 +1470,12 @@ static void http_connect(curl_socket_t *infdp, | |
| 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(clientfd[i], &output); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(clientfd[i] > maxfd) | |
| @@ -1486,12 +1486,12 @@ 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(serverfd[i], &input); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(serverfd[i] > maxfd) | |
| @@ -1500,12 +1500,12 @@ static void http_connect(curl_socket_t *infdp, | |
| 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__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(serverfd[i], &output); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(serverfd[i] > maxfd) | |
| @@ -2322,12 +2322,12 @@ static int test_sws(int argc, char *argv[]) | |
| for(socket_idx = 0; socket_idx < num_sockets; ++socket_idx) { | |
| /* Listen on all sockets */ | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic push | |
| #pragma GCC diagnostic ignored "-Warith-conversion" | |
| #endif | |
| FD_SET(all_sockets[socket_idx], &input); | |
| - | #if defined(__DJGPP__) |
| + | #ifdef __DJGPP__ |
| #pragma GCC diagnostic pop | |
| #endif | |
| if(all_sockets[socket_idx] > maxfd) | |
tests/server/tftpd.c+1 -1
| @@ -508,7 +508,7 @@ static int synchnet(curl_socket_t f /* socket to flush */) | |
| curl_socklen_t fromaddrlen; | |
| for(;;) { | |
| - | #if defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO) |
| + | #ifdef HAVE_IOCTLSOCKET_CAMEL_FIONBIO |
| long i; | |
| (void)IoctlSocket(f, FIONBIO, &i); | |
| #elif defined(HAVE_IOCTLSOCKET) | |
tests/unit/unit1979.c+1 -1
| @@ -131,7 +131,7 @@ static CURLcode test_unit1979(char *arg) | |
| buffer); | |
| curlx_dyn_free(&canonical_path); | |
| } | |
| - | #endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */ |
| + | #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */ |
| UNITTEST_END_SIMPLE | |
| } | |
tests/unit/unit1980.c+1 -1
| @@ -102,7 +102,7 @@ static CURLcode test_unit1980(char *arg) | |
| buffer); | |
| curlx_dyn_free(&canonical_query); | |
| } | |
| - | #endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */ |
| + | #endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */ |
| UNITTEST_END_SIMPLE | |
| } | |
tests/unit/unit3205.c+7 -7
| @@ -60,7 +60,7 @@ static CURLcode test_unit3205(char *arg) | |
| "ECDHE-RSA-CHACHA20-POLY1305" }, | |
| { 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256", | |
| "ECDHE-ECDSA-CHACHA20-POLY1305" }, | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| { 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA", | |
| "AES128-SHA" }, | |
| { 0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA", | |
| @@ -451,19 +451,19 @@ static CURLcode test_unit3205(char *arg) | |
| { 0xC030, "ECDHE-RSA-AES256-GCM-SHA384"}, | |
| { 0xCCA9, "ECDHE-ECDSA-CHACHA20-POLY1305"}, | |
| { 0xCCA8, "ECDHE-RSA-CHACHA20-POLY1305"}, | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| { 0x009E, "DHE-RSA-AES128-GCM-SHA256"}, | |
| { 0x009F, "DHE-RSA-AES256-GCM-SHA384"}, | |
| #else | |
| { 0x0000, "DHE-RSA-AES128-GCM-SHA256"}, | |
| { 0x0000, "DHE-RSA-AES256-GCM-SHA384"}, | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| { 0xCCAA, "DHE-RSA-CHACHA20-POLY1305"}, | |
| #else | |
| { 0x0000, "DHE-RSA-CHACHA20-POLY1305"}, | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| { 0xC023, "ECDHE-ECDSA-AES128-SHA256" }, | |
| { 0xC027, "ECDHE-RSA-AES128-SHA256" }, | |
| { 0xC009, "ECDHE-ECDSA-AES128-SHA" }, | |
| @@ -482,14 +482,14 @@ static CURLcode test_unit3205(char *arg) | |
| { 0x0000, "ECDHE-ECDSA-AES256-SHA" }, | |
| { 0x0000, "ECDHE-RSA-AES256-SHA" }, | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| { 0x0067, "DHE-RSA-AES128-SHA256" }, | |
| { 0x006B, "DHE-RSA-AES256-SHA256" }, | |
| #else | |
| { 0x0000, "DHE-RSA-AES128-SHA256" }, | |
| { 0x0000, "DHE-RSA-AES256-SHA256" }, | |
| #endif | |
| - | #if defined(USE_MBEDTLS) |
| + | #ifdef USE_MBEDTLS |
| { 0x009C, "AES128-GCM-SHA256" }, | |
| { 0x009D, "AES256-GCM-SHA384" }, | |
| { 0x003C, "AES128-SHA256" }, | |
| @@ -605,7 +605,7 @@ static CURLcode test_unit3205(char *arg) | |
| j++; | |
| } | |
| } | |
| - | #endif /* defined(USE_MBEDTLS) || defined(USE_RUSTLS) */ |
| + | #endif /* USE_MBEDTLS || USE_RUSTLS */ |
| UNITTEST_END_SIMPLE | |
| } | |