windows: use built-in `_WIN32` macro to detect Windows
—
$ git checkout -f e9a7d4a1c8377dbcf9a2d94365f60e3e5dff48f8
Previous HEAD position was 2c4c780472 curl.h: delete Symbian OS references
HEAD is now at e9a7d4a1c8 windows: use built-in `_WIN32` macro to detect Windows
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
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/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.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_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-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:123: installing './compile'
configure.ac:424: installing './config.guess'
configure.ac:424: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'
$ 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 ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.5.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... 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 for inline... inline
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 SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... 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 for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... 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 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 for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for library containing psl_builtin... -lpsl
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... 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 pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (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 can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fchmod... yes
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... 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 NTLM delegation to winbind's helper... no
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 DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
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 lib/libcurl.plist
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.5.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build libcurl: Shared=no, Static=yes
Built-in manual: enabled
--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 fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
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-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: unrecognized options: --disable-docs
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
configure: WARNING: unrecognized options: --disable-docs
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_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_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1 \
&& touch -r "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
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'
| @@ -29,7 +29,7 @@ | |
| #include <errno.h> | |
| #include <stdlib.h> | |
| #include <string.h> | |
| - | #ifndef WIN32 |
| + | #ifndef _WIN32 |
| # include <unistd.h> | |
| #endif | |
| #include <curl/curl.h> | |
| @@ -33,7 +33,7 @@ | |
| #include <curl/curl.h> | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # define FILENO(fp) _fileno(fp) | |
| #else | |
| # define FILENO(fp) fileno(fp) | |
| @@ -91,7 +91,7 @@ main(void) | |
| printf("-----------------------------------------------\n" | |
| "Setting a cookie \"PREF\" via cookie interface:\n"); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #define snprintf _snprintf | |
| #endif | |
| /* Netscape format cookie */ | |
| @@ -30,7 +30,7 @@ | |
| #include <stdlib.h> | |
| #include <curl/curl.h> | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <windows.h> | |
| #include <winsock2.h> | |
| #include <ws2tcpip.h> | |
| @@ -96,7 +96,7 @@ int main(void) | |
| struct sockaddr_in servaddr; /* socket address structure */ | |
| curl_socket_t sockfd; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| WSADATA wsaData; | |
| int initwsa = WSAStartup(MAKEWORD(2, 2), &wsaData); | |
| if(initwsa) { | |
| @@ -168,7 +168,7 @@ int main(void) | |
| } | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| WSACleanup(); | |
| #endif | |
| return 0; | |
| @@ -29,7 +29,7 @@ | |
| #include <sys/stat.h> | |
| #include <fcntl.h> | |
| #include <errno.h> | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <io.h> | |
| #else | |
| #include <unistd.h> | |
| @@ -28,13 +28,13 @@ | |
| #include <stdio.h> | |
| #include <curl/curl.h> | |
| - | #ifndef WIN32 |
| + | #ifndef _WIN32 |
| #include <net/if.h> | |
| #endif | |
| int main(void) | |
| { | |
| - | #ifndef WIN32 |
| + | #ifndef _WIN32 |
| /* Windows users need to find how to use if_nametoindex() */ | |
| CURL *curl; | |
| CURLcode res; | |
| @@ -190,7 +190,7 @@ CURL_VERSION_ZSTD 7.72.0 | |
| CURL_WAIT_POLLIN 7.28.0 | |
| CURL_WAIT_POLLOUT 7.28.0 | |
| CURL_WAIT_POLLPRI 7.28.0 | |
| - | CURL_WIN32 7.69.0 |
| + | CURL_WIN32 7.69.0 - 8.5.0 |
| CURL_WRITEFUNC_ERROR 7.87.0 | |
| CURL_WRITEFUNC_PAUSE 7.18.0 | |
| CURL_ZERO_TERMINATED 7.56.0 | |
| @@ -53,15 +53,6 @@ | |
| #include "curlver.h" /* libcurl version defines */ | |
| #include "system.h" /* determine things run-time */ | |
| - | /* |
| - | * Define CURL_WIN32 when build target is Win32 API |
| - | */ |
| - | |
| - | #if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \ |
| - | !defined(__SYMBIAN32__) |
| - | #define CURL_WIN32 |
| - | #endif |
| - | |
| #include <stdio.h> | |
| #include <limits.h> | |
| @@ -74,7 +65,7 @@ | |
| #include <sys/types.h> | |
| #include <time.h> | |
| - | #if defined(CURL_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) |
| + | #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) |
| #if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \ | |
| defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H)) | |
| /* The check above prevents the winsock2 inclusion if winsock.h already was | |
| @@ -97,11 +88,11 @@ | |
| #include <sys/select.h> | |
| #endif | |
| - | #if !defined(CURL_WIN32) && !defined(_WIN32_WCE) |
| + | #if !defined(_WIN32) && !defined(_WIN32_WCE) |
| #include <sys/socket.h> | |
| #endif | |
| - | #if !defined(CURL_WIN32) |
| + | #if !defined(_WIN32) |
| #include <sys/time.h> | |
| #endif | |
| @@ -128,7 +119,7 @@ typedef void CURLSH; | |
| #ifdef CURL_STATICLIB | |
| # define CURL_EXTERN | |
| - | #elif defined(CURL_WIN32) || defined(__SYMBIAN32__) || \ |
| + | #elif defined(_WIN32) || defined(__SYMBIAN32__) || \ |
| (__has_declspec_attribute(dllexport) && \ | |
| __has_declspec_attribute(dllimport)) | |
| # if defined(BUILDING_LIBCURL) | |
| @@ -144,7 +135,7 @@ typedef void CURLSH; | |
| #ifndef curl_socket_typedef | |
| /* socket typedef */ | |
| - | #if defined(CURL_WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H) |
| + | #if defined(_WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H) |
| typedef SOCKET curl_socket_t; | |
| #define CURL_SOCKET_BAD INVALID_SOCKET | |
| #else | |
| @@ -60,13 +60,13 @@ | |
| #include "progress.h" | |
| #include "timediff.h" | |
| - | # if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ |
| - | defined(WIN32) |
| - | # define CARES_STATICLIB |
| - | # endif |
| - | # include <ares.h> |
| - | # include <ares_version.h> /* really old c-ares didn't include this by |
| - | itself */ |
| + | #if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ |
| + | defined(_WIN32) |
| + | # define CARES_STATICLIB |
| + | #endif |
| + | #include <ares.h> |
| + | #include <ares_version.h> /* really old c-ares didn't include this by |
| + | itself */ |
| #if ARES_VERSION >= 0x010500 | |
| /* c-ares 1.5.0 or later, the callback proto is modified */ | |
| @@ -81,7 +81,7 @@ | |
| #include "memdebug.h" | |
| - | #if defined(ENABLE_IPV6) && defined(IPV6_V6ONLY) && defined(WIN32) |
| + | #if defined(ENABLE_IPV6) && defined(IPV6_V6ONLY) && defined(_WIN32) |
| /* It makes support for IPv4-mapped IPv6 addresses. | |
| * Linux kernel, NetBSD, FreeBSD and Darwin: default is off; | |
| * Windows Vista and later: default is on; | |
| @@ -659,7 +659,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error) | |
| int err = 0; | |
| curl_socklen_t errSize = sizeof(err); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* | |
| * In October 2003 we effectively nullified this function on Windows due to | |
| * problems with it using all CPU in multi-threaded cases. | |
| @@ -68,7 +68,7 @@ | |
| #undef send | |
| #undef recv | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # ifdef UNICODE | |
| # undef wcsdup | |
| # undef _wcsdup | |
| @@ -134,7 +134,7 @@ extern curl_free_callback Curl_cfree; | |
| extern curl_realloc_callback Curl_crealloc; | |
| extern curl_strdup_callback Curl_cstrdup; | |
| extern curl_calloc_callback Curl_ccalloc; | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| extern curl_wcsdup_callback Curl_cwcsdup; | |
| #endif | |
| @@ -160,7 +160,7 @@ extern curl_wcsdup_callback Curl_cwcsdup; | |
| #undef free | |
| #define free(ptr) Curl_cfree(ptr) | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # ifdef UNICODE | |
| # undef wcsdup | |
| # define wcsdup(ptr) Curl_cwcsdup(ptr) | |
| @@ -32,7 +32,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| #include "curl_multibyte.h" | |
| @@ -84,7 +84,7 @@ char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w) | |
| return str_utf8; | |
| } | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| #if defined(USE_WIN32_LARGE_FILES) || defined(USE_WIN32_SMALL_FILES) | |
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "curl_setup.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| /* | |
| * MultiByte conversions using Windows kernel32 library. | |
| @@ -33,7 +33,7 @@ | |
| wchar_t *curlx_convert_UTF8_to_wchar(const char *str_utf8); | |
| char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w); | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| /* | |
| * Macros curlx_convert_UTF8_to_tchar(), curlx_convert_tchar_to_UTF8() | |
| @@ -54,7 +54,7 @@ char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w); | |
| * ensure that the curl memdebug override macros do not replace them. | |
| */ | |
| - | #if defined(UNICODE) && defined(WIN32) |
| + | #if defined(UNICODE) && defined(_WIN32) |
| #define curlx_convert_UTF8_to_tchar(ptr) curlx_convert_UTF8_to_wchar((ptr)) | |
| #define curlx_convert_tchar_to_UTF8(ptr) curlx_convert_wchar_to_UTF8((ptr)) | |
| @@ -78,7 +78,7 @@ typedef union { | |
| const unsigned char *const_tbyte_ptr; | |
| } xcharp_u; | |
| - | #endif /* UNICODE && WIN32 */ |
| + | #endif /* UNICODE && _WIN32 */ |
| #define curlx_unicodefree(ptr) \ | |
| do { \ | |
| @@ -28,7 +28,7 @@ | |
| #include <curl/curl.h> | |
| #include "urldata.h" | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # undef PATH_MAX | |
| # define PATH_MAX MAX_PATH | |
| # ifndef R_OK | |
| @@ -39,7 +39,7 @@ | |
| /* The last #include file should be: */ | |
| #include "memdebug.h" | |
| - | #if defined(WIN32) && !defined(USE_LWIPSOCK) |
| + | #if defined(_WIN32) && !defined(USE_LWIPSOCK) |
| #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e) | |
| #define SET_RCVTIMEO(tv,s) int tv = s*1000 | |
| #elif defined(LWIP_SO_SNDRCVTIMEO_NONSTANDARD) | |
| @@ -41,15 +41,7 @@ | |
| #pragma warning(disable:4127) | |
| #endif | |
| - | /* |
| - | * Define WIN32 when build target is Win32 API |
| - | */ |
| - | |
| - | #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) |
| - | #define WIN32 |
| - | #endif |
| - | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* | |
| * Don't include unneeded stuff in Windows headers to avoid compiler | |
| * warnings and macro clashes. | |
| @@ -87,7 +79,7 @@ | |
| #ifdef _WIN32_WCE | |
| # include "config-win32ce.h" | |
| #else | |
| - | # ifdef WIN32 |
| + | # ifdef _WIN32 |
| # include "config-win32.h" | |
| # endif | |
| #endif | |
| @@ -505,11 +497,11 @@ | |
| 5. set dir/file naming defines | |
| */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # define DIR_CHAR "\\" | |
| - | #else /* WIN32 */ |
| + | #else /* _WIN32 */ |
| # ifdef MSDOS /* Watt-32 */ | |
| @@ -534,7 +526,7 @@ | |
| # define DIR_CHAR "/" | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| /* ---------------------------------------------------------------- */ | |
| /* resolver specialty compile-time defines */ | |
| @@ -557,7 +549,7 @@ | |
| #if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO) | |
| # define CURLRES_IPV6 | |
| - | #elif defined(ENABLE_IPV6) && (defined(WIN32) || defined(__CYGWIN__)) |
| + | #elif defined(ENABLE_IPV6) && (defined(_WIN32) || defined(__CYGWIN__)) |
| /* assume on Windows that IPv6 without getaddrinfo is a broken build */ | |
| # error "Unexpected build: IPv6 is enabled but getaddrinfo was not found." | |
| #else | |
| @@ -714,7 +706,7 @@ | |
| /* In Windows the default file mode is text but an application can override it. | |
| Therefore we specify it explicitly. https://github.com/curl/curl/pull/258 | |
| */ | |
| - | #if defined(WIN32) || defined(MSDOS) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| #define FOPEN_READTEXT "rt" | |
| #define FOPEN_WRITETEXT "wt" | |
| #define FOPEN_APPENDTEXT "at" | |
| @@ -783,11 +775,11 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, | |
| /* Certain Windows implementations are not aligned with what curl expects, | |
| so always use the local one on this platform. E.g. the mingw-w64 | |
| implementation can return wrong results for non-ASCII inputs. */ | |
| - | #if defined(HAVE_BASENAME) && defined(WIN32) |
| + | #if defined(HAVE_BASENAME) && defined(_WIN32) |
| #undef HAVE_BASENAME | |
| #endif | |
| - | #if defined(USE_UNIX_SOCKETS) && defined(WIN32) |
| + | #if defined(USE_UNIX_SOCKETS) && defined(_WIN32) |
| # if !defined(UNIX_PATH_MAX) | |
| /* Replicating logic present in afunix.h | |
| (distributed with newer Windows 10 SDK versions only) */ | |
| @@ -56,7 +56,7 @@ | |
| #include <sys/time.h> | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <io.h> | |
| #include <fcntl.h> | |
| #endif | |
| @@ -125,7 +125,7 @@ curl_free_callback Curl_cfree = (curl_free_callback)free; | |
| curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc; | |
| curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup; | |
| curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc; | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| curl_wcsdup_callback Curl_cwcsdup = Curl_wcsdup; | |
| #endif | |
| @@ -153,7 +153,7 @@ static CURLcode global_init(long flags, bool memoryfuncs) | |
| Curl_crealloc = (curl_realloc_callback)realloc; | |
| Curl_cstrdup = (curl_strdup_callback)system_strdup; | |
| Curl_ccalloc = (curl_calloc_callback)calloc; | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| Curl_cwcsdup = (curl_wcsdup_callback)_wcsdup; | |
| #endif | |
| } | |
| @@ -287,7 +287,7 @@ void curl_global_cleanup(void) | |
| Curl_ssl_cleanup(); | |
| Curl_resolver_global_cleanup(); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| Curl_win32_cleanup(easy_init_flags); | |
| #endif | |
| @@ -69,7 +69,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) |
| + | #if defined(_WIN32) || defined(MSDOS) || defined(__EMX__) |
| #define DOS_FILESYSTEM 1 | |
| #elif defined(__amigaos4__) | |
| #define AMIGA_FILESYSTEM 1 | |
| @@ -38,7 +38,7 @@ | |
| 2. For systems with config-*.h files, define them there. | |
| */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* int recv(SOCKET, char *, int, int) */ | |
| #define RECV_TYPE_ARG1 SOCKET | |
| #define RECV_TYPE_ARG2 char * | |
| @@ -35,7 +35,7 @@ static char *GetEnv(const char *variable) | |
| defined(__ORBIS__) || defined(__PROSPERO__) /* PlayStation 4 and 5 */ | |
| (void)variable; | |
| return NULL; | |
| - | #elif defined(WIN32) |
| + | #elif defined(_WIN32) |
| /* This uses Windows API instead of C runtime getenv() to get the environment | |
| variable since some changes aren't always visible to the latter. #4774 */ | |
| char *buf = NULL; | |
| @@ -36,7 +36,7 @@ | |
| #ifdef USE_LIBIDN2 | |
| #include <idn2.h> | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| #define IDN2_LOOKUP(name, host, flags) \ | |
| idn2_lookup_u8((const uint8_t *)name, (uint8_t **)host, flags) | |
| #else | |
| @@ -208,7 +208,7 @@ ALLOC_FUNC char *curl_dbg_strdup(const char *str, | |
| return mem; | |
| } | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| ALLOC_FUNC wchar_t *curl_dbg_wcsdup(const wchar_t *str, | |
| int line, const char *source) | |
| { | |
| @@ -64,7 +64,7 @@ CURL_EXTERN ALLOC_SIZE(2) void *curl_dbg_realloc(void *ptr, | |
| CURL_EXTERN void curl_dbg_free(void *ptr, int line, const char *source); | |
| CURL_EXTERN ALLOC_FUNC char *curl_dbg_strdup(const char *str, int line, | |
| const char *src); | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| CURL_EXTERN ALLOC_FUNC wchar_t *curl_dbg_wcsdup(const wchar_t *str, | |
| int line, | |
| const char *source); | |
| @@ -121,7 +121,7 @@ CURL_EXTERN int curl_dbg_fclose(FILE *file, int line, const char *source); | |
| #define send(a,b,c,d) curl_dbg_send(a,b,c,d, __LINE__, __FILE__) | |
| #define recv(a,b,c,d) curl_dbg_recv(a,b,c,d, __LINE__, __FILE__) | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # ifdef UNICODE | |
| # undef wcsdup | |
| # define wcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__) | |
| @@ -48,7 +48,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # ifndef R_OK | |
| # define R_OK 4 | |
| # endif | |
| @@ -327,7 +327,7 @@ int Curl_parsenetrc(const char *host, char **loginp, char **passwordp, | |
| } | |
| retcode = parsenetrc(host, loginp, passwordp, filealloc); | |
| free(filealloc); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if(retcode == NETRC_FILE_MISSING) { | |
| /* fallback to the old-style "_netrc" file */ | |
| filealloc = curl_maprintf("%s%s_netrc", home, DIR_CHAR); | |
| @@ -46,7 +46,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600 | |
| # define HAVE_WIN_BCRYPTGENRANDOM | |
| @@ -133,7 +133,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) | |
| /* ---- non-cryptographic version following ---- */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if(!seeded) { | |
| result = Curl_win32_random((unsigned char *)rnd, sizeof(*rnd)); | |
| if(result != CURLE_NOT_BUILT_IN) | |
| @@ -148,7 +148,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) | |
| } | |
| #endif | |
| - | #if defined(RANDOM_FILE) && !defined(WIN32) |
| + | #if defined(RANDOM_FILE) && !defined(_WIN32) |
| if(!seeded) { | |
| /* if there's a random file to read a seed from, use it */ | |
| int fd = open(RANDOM_FILE, O_RDONLY); | |
| @@ -41,7 +41,7 @@ CURLcode Curl_rand_hex(struct Curl_easy *data, unsigned char *rnd, | |
| CURLcode Curl_rand_alnum(struct Curl_easy *data, unsigned char *rnd, | |
| size_t num); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* Random generator shared between the Schannel vtls and Curl_rand*() | |
| functions */ | |
| CURLcode Curl_win32_random(unsigned char *entropy, size_t length); | |
| @@ -40,7 +40,7 @@ | |
| /* return 0 on success, 1 on error */ | |
| int Curl_rename(const char *oldpath, const char *newpath) | |
| { | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* rename() on Windows doesn't overwrite, so we can't use it here. | |
| MoveFileEx() will overwrite and is usually atomic, however it fails | |
| when there are open handles to the file. */ | |
| @@ -76,7 +76,7 @@ int Curl_wait_ms(timediff_t timeout_ms) | |
| } | |
| #if defined(MSDOS) | |
| delay(timeout_ms); | |
| - | #elif defined(WIN32) |
| + | #elif defined(_WIN32) |
| /* prevent overflow, timeout_ms is typecast to ULONG/DWORD. */ | |
| #if TIMEDIFF_T_MAX >= ULONG_MAX | |
| if(timeout_ms >= ULONG_MAX) | |
| @@ -27,7 +27,7 @@ | |
| #if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #define getpid GetCurrentProcessId | |
| #endif | |
| @@ -28,7 +28,7 @@ | |
| #include "rand.h" | |
| #if !defined(HAVE_SOCKETPAIR) && !defined(CURL_DISABLE_SOCKETPAIR) | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* | |
| * This is a socketpair() implementation for Windows. | |
| */ | |
| @@ -50,7 +50,7 @@ | |
| #ifndef INADDR_LOOPBACK | |
| #define INADDR_LOOPBACK 0x7f000001 | |
| #endif /* !INADDR_LOOPBACK */ | |
| - | #endif /* !WIN32 */ |
| + | #endif /* !_WIN32 */ |
| #include "nonblock.h" /* for curlx_nonblock */ | |
| #include "timeval.h" /* needed before select.h */ | |
| @@ -87,7 +87,7 @@ int Curl_socketpair(int domain, int type, int protocol, | |
| socks[0] = socks[1] = CURL_SOCKET_BAD; | |
| - | #if defined(WIN32) || defined(__CYGWIN__) |
| + | #if defined(_WIN32) || defined(__CYGWIN__) |
| /* don't set SO_REUSEADDR on Windows */ | |
| (void)reuse; | |
| #ifdef SO_EXCLUSIVEADDRUSE | |
| @@ -26,7 +26,7 @@ | |
| #include <curl/curl.h> | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <wchar.h> | |
| #endif | |
| @@ -56,7 +56,7 @@ char *Curl_strdup(const char *str) | |
| } | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /*************************************************************************** | |
| * | |
| * Curl_wcsdup(source) | |
| @@ -28,7 +28,7 @@ | |
| #ifndef HAVE_STRDUP | |
| char *Curl_strdup(const char *str); | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| wchar_t* Curl_wcsdup(const wchar_t* src); | |
| #endif | |
| void *Curl_memdup(const void *src, size_t buffer_length); | |
| @@ -48,7 +48,7 @@ | |
| #include "curl_memory.h" | |
| #include "memdebug.h" | |
| - | #if defined(WIN32) || defined(_WIN32_WCE) |
| + | #if defined(_WIN32) || defined(_WIN32_WCE) |
| #define PRESERVE_WINDOWS_ERROR_CODE | |
| #endif | |
| @@ -762,7 +762,7 @@ get_winsock_error (int err, char *buf, size_t len) | |
| } | |
| #endif /* USE_WINSOCK */ | |
| - | #if defined(WIN32) || defined(_WIN32_WCE) |
| + | #if defined(_WIN32) || defined(_WIN32_WCE) |
| /* This is a helper function for Curl_strerror that converts Windows API error | |
| * codes (GetLastError) to error messages. | |
| * Returns NULL if no error message was found for error code. | |
| @@ -804,7 +804,7 @@ get_winapi_error(int err, char *buf, size_t buflen) | |
| return (*buf ? buf : NULL); | |
| } | |
| - | #endif /* WIN32 || _WIN32_WCE */ |
| + | #endif /* _WIN32 || _WIN32_WCE */ |
| /* | |
| * Our thread-safe and smart strerror() replacement. | |
| @@ -837,15 +837,15 @@ const char *Curl_strerror(int err, char *buf, size_t buflen) | |
| if(!buflen) | |
| return NULL; | |
| - | #ifndef WIN32 |
| + | #ifndef _WIN32 |
| DEBUGASSERT(err >= 0); | |
| #endif | |
| max = buflen - 1; | |
| *buf = '\0'; | |
| - | #if defined(WIN32) || defined(_WIN32_WCE) |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) || defined(_WIN32_WCE) |
| + | #if defined(_WIN32) |
| /* 'sys_nerr' is the maximum errno number, it is not widely portable */ | |
| if(err >= 0 && err < sys_nerr) | |
| strncpy(buf, sys_errlist[err], max); | |
| @@ -923,7 +923,7 @@ const char *Curl_strerror(int err, char *buf, size_t buflen) | |
| * Curl_winapi_strerror: | |
| * Variant of Curl_strerror if the error code is definitely Windows API. | |
| */ | |
| - | #if defined(WIN32) || defined(_WIN32_WCE) |
| + | #if defined(_WIN32) || defined(_WIN32_WCE) |
| const char *Curl_winapi_strerror(DWORD err, char *buf, size_t buflen) | |
| { | |
| #ifdef PRESERVE_WINDOWS_ERROR_CODE | |
| @@ -958,7 +958,7 @@ const char *Curl_winapi_strerror(DWORD err, char *buf, size_t buflen) | |
| return buf; | |
| } | |
| - | #endif /* WIN32 || _WIN32_WCE */ |
| + | #endif /* _WIN32 || _WIN32_WCE */ |
| #ifdef USE_WINDOWS_SSPI | |
| /* | |
| @@ -29,7 +29,7 @@ | |
| #define STRERROR_LEN 256 /* a suitable length */ | |
| const char *Curl_strerror(int err, char *buf, size_t buflen); | |
| - | #if defined(WIN32) || defined(_WIN32_WCE) |
| + | #if defined(_WIN32) || defined(_WIN32_WCE) |
| const char *Curl_winapi_strerror(DWORD err, char *buf, size_t buflen); | |
| #endif | |
| #ifdef USE_WINDOWS_SSPI | |
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| #include <curl/curl.h> | |
| #include "system_win32.h" | |
| @@ -238,4 +238,4 @@ HMODULE Curl_load_library(LPCTSTR filename) | |
| #endif | |
| } | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| @@ -26,7 +26,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| extern LARGE_INTEGER Curl_freq; | |
| extern bool Curl_isVistaOrGreater; | |
| @@ -42,8 +42,8 @@ extern IF_NAMETOINDEX_FN Curl_if_nametoindex; | |
| /* This is used to dynamically load DLLs */ | |
| HMODULE Curl_load_library(LPCTSTR filename); | |
| - | #else /* WIN32 */ |
| + | #else /* _WIN32 */ |
| #define Curl_win32_init(x) CURLE_OK | |
| - | #endif /* !WIN32 */ |
| + | #endif /* !_WIN32 */ |
| #endif /* HEADER_CURL_SYSTEM_WIN32_H */ | |
| @@ -53,7 +53,7 @@ struct timeval *curlx_mstotv(struct timeval *tv, timediff_t ms) | |
| #endif | |
| tv->tv_sec = (time_t)tv_sec; | |
| tv->tv_usec = (suseconds_t)tv_usec; | |
| - | #elif defined(WIN32) /* maybe also others in the future */ |
| + | #elif defined(_WIN32) /* maybe also others in the future */ |
| #if TIMEDIFF_T_MAX > LONG_MAX | |
| /* tv_sec overflow check on Windows there we know it is long */ | |
| if(tv_sec > LONG_MAX) | |
| @@ -24,7 +24,7 @@ | |
| #include "timeval.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| #include <curl/curl.h> | |
| #include "system_win32.h" | |
| @@ -820,7 +820,7 @@ CURLcode Curl_done_sending(struct Curl_easy *data, | |
| return CURLE_OK; | |
| } | |
| - | #if defined(WIN32) && defined(USE_WINSOCK) |
| + | #if defined(_WIN32) && defined(USE_WINSOCK) |
| #ifndef SIO_IDEAL_SEND_BACKLOG_QUERY | |
| #define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747B | |
| #endif | |
| @@ -1014,7 +1014,7 @@ static CURLcode readwrite_upload(struct Curl_easy *data, | |
| if(result) | |
| return result; | |
| - | #if defined(WIN32) && defined(USE_WINSOCK) |
| + | #if defined(_WIN32) && defined(USE_WINSOCK) |
| { | |
| struct curltime n = Curl_now(); | |
| if(Curl_timediff(n, k->last_sndbuf_update) > 1000) { | |
| @@ -1724,14 +1724,14 @@ static void zonefrom_url(CURLU *uh, struct Curl_easy *data, | |
| conn->scope_id = (unsigned int)scope; | |
| #if defined(HAVE_IF_NAMETOINDEX) | |
| else { | |
| - | #elif defined(WIN32) |
| + | #elif defined(_WIN32) |
| else if(Curl_if_nametoindex) { | |
| #endif | |
| - | #if defined(HAVE_IF_NAMETOINDEX) || defined(WIN32) |
| + | #if defined(HAVE_IF_NAMETOINDEX) || defined(_WIN32) |
| /* Zone identifier is not numeric */ | |
| unsigned int scopeidx = 0; | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| scopeidx = Curl_if_nametoindex(zoneid); | |
| #else | |
| scopeidx = if_nametoindex(zoneid); | |
| @@ -1746,7 +1746,7 @@ static void zonefrom_url(CURLU *uh, struct Curl_easy *data, | |
| else | |
| conn->scope_id = scopeidx; | |
| } | |
| - | #endif /* HAVE_IF_NAMETOINDEX || WIN32 */ |
| + | #endif /* HAVE_IF_NAMETOINDEX || _WIN32 */ |
| free(zoneid); | |
| } | |
| @@ -206,7 +206,7 @@ size_t Curl_is_absolute_url(const char *url, char *buf, size_t buflen, | |
| (void)buflen; /* only used in debug-builds */ | |
| if(buf) | |
| buf[0] = 0; /* always leave a defined value in buf */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if(guess_scheme && STARTS_WITH_DRIVE_PREFIX(url)) | |
| return 0; | |
| #endif | |
| @@ -1056,7 +1056,7 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags) | |
| ptr += 9; /* now points to the slash after the host */ | |
| } | |
| else { | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| size_t len; | |
| /* the host name, NetBIOS computer name, can not contain disallowed | |
| @@ -1095,7 +1095,7 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags) | |
| /* no host for file: URLs by default */ | |
| Curl_dyn_reset(&host); | |
| - | #if !defined(MSDOS) && !defined(WIN32) && !defined(__CYGWIN__) |
| + | #if !defined(_WIN32) && !defined(MSDOS) && !defined(__CYGWIN__) |
| /* Don't allow Windows drive letters when not in Windows. | |
| * This catches both "file:/c:" and "file:c:" */ | |
| if(('/' == path[0] && STARTS_WITH_URL_DRIVE_PREFIX(&path[1])) || | |
| @@ -721,7 +721,7 @@ struct SingleRequest { | |
| #ifndef CURL_DISABLE_DOH | |
| struct dohdata *doh; /* DoH specific data for this request */ | |
| #endif | |
| - | #if defined(WIN32) && defined(USE_WINSOCK) |
| + | #if defined(_WIN32) && defined(USE_WINSOCK) |
| struct curltime last_sndbuf_update; /* last time readwrite_upload called | |
| win_update_buffer_size */ | |
| #endif | |
| @@ -1394,7 +1394,7 @@ struct UrlState { | |
| /* a place to store the most recently set (S)FTP entrypath */ | |
| char *most_recent_ftp_entrypath; | |
| - | #if !defined(WIN32) && !defined(MSDOS) && !defined(__EMX__) |
| + | #if !defined(_WIN32) && !defined(MSDOS) && !defined(__EMX__) |
| /* do FTP line-end conversions on most platforms */ | |
| #define CURL_DO_LINEEND_CONV | |
| /* for FTP downloads: track CRLF sequences that span blocks */ | |
| @@ -39,7 +39,7 @@ | |
| #ifdef USE_ARES | |
| # if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \ | |
| - | defined(WIN32) |
| + | defined(_WIN32) |
| # define CARES_STATICLIB | |
| # endif | |
| # include <ares.h> | |
| @@ -512,7 +512,7 @@ static const struct feat features_table[] = { | |
| #ifdef CURLDEBUG | |
| FEATURE("TrackMemory", NULL, CURL_VERSION_CURLDEBUG), | |
| #endif | |
| - | #if defined(WIN32) && defined(UNICODE) && defined(_UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) && defined(_UNICODE) |
| FEATURE("Unicode", NULL, CURL_VERSION_UNICODE), | |
| #endif | |
| #ifdef USE_UNIX_SOCKETS | |
| @@ -24,7 +24,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| #include <curl/curl.h> | |
| #include "version_win32.h" | |
| @@ -316,4 +316,4 @@ bool curlx_verify_windows_version(const unsigned int majorVersion, | |
| return matched; | |
| } | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| @@ -26,7 +26,7 @@ | |
| #include "curl_setup.h" | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| /* Version condition */ | |
| typedef enum { | |
| @@ -51,6 +51,6 @@ bool curlx_verify_windows_version(const unsigned int majorVersion, | |
| const PlatformIdentifier platform, | |
| const VersionCondition condition); | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| #endif /* HEADER_CURL_VERSION_WIN32_H */ | |
| @@ -1406,7 +1406,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf, | |
| } | |
| /* Known to not work on Windows */ | |
| - | #if !defined(WIN32) && defined(HAVE_QUICHE_CONN_SET_QLOG_FD) |
| + | #if !defined(_WIN32) && defined(HAVE_QUICHE_CONN_SET_QLOG_FD) |
| { | |
| int qfd; | |
| (void)Curl_qlogdir(data, ctx->scid, sizeof(ctx->scid), &qfd); | |
| @@ -60,7 +60,7 @@ Curl_tls_keylog_open(void) | |
| if(keylog_file_name) { | |
| keylog_file_fp = fopen(keylog_file_name, FOPEN_APPENDTEXT); | |
| if(keylog_file_fp) { | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if(setvbuf(keylog_file_fp, NULL, _IONBF, 0)) | |
| #else | |
| if(setvbuf(keylog_file_fp, NULL, _IOLBF, 4096)) | |
| @@ -37,7 +37,7 @@ | |
| #include "warnless.h" | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #undef read | |
| #undef write | |
| #endif | |
| @@ -367,7 +367,7 @@ curl_socket_t curlx_sitosk(int i) | |
| #endif /* USE_WINSOCK */ | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| ssize_t curlx_read(int fd, void *buf, size_t count) | |
| { | |
| @@ -379,7 +379,7 @@ ssize_t curlx_write(int fd, const void *buf, size_t count) | |
| return (ssize_t)write(fd, buf, curlx_uztoui(count)); | |
| } | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| /* Ensure that warnless.h redefinitions continue to have an effect | |
| in "unity" builds. */ | |
| @@ -69,13 +69,13 @@ curl_socket_t curlx_sitosk(int i); | |
| #endif /* USE_WINSOCK */ | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| ssize_t curlx_read(int fd, void *buf, size_t count); | |
| ssize_t curlx_write(int fd, const void *buf, size_t count); | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| #if defined(__INTEL_COMPILER) && defined(__unix__) | |
| @@ -96,7 +96,7 @@ unsigned short curlx_ntohs(unsigned short usnum); | |
| #ifndef HEADER_CURL_WARNLESS_H_REDEFS | |
| #define HEADER_CURL_WARNLESS_H_REDEFS | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| #undef read | |
| #define read(fd, buf, count) curlx_read(fd, buf, count) | |
| #undef write | |
| @@ -59,6 +59,7 @@ my %warnings = ( | |
| 'ASTERISKSPACE' => 'pointer declared with space after asterisk', | |
| 'BADCOMMAND' => 'bad !checksrc! instruction', | |
| 'BANNEDFUNC' => 'a banned function was used', | |
| + | 'BANNEDPREPROC' => 'a banned symbol was used on a preprocessor line', |
| 'BRACEELSE' => '} else on the same line', | |
| 'BRACEPOS' => 'wrong position for an open brace', | |
| 'BRACEWHILE' => 'A single space between open brace and while', | |
| @@ -892,6 +893,18 @@ sub scanfile { | |
| "multiple spaces"); | |
| } | |
| preproc: | |
| + | if($prep) { |
| + | # scan for use of banned symbols on a preprocessor line |
| + | if($l =~ /^(^|.*\W) |
| + | (WIN32) |
| + | (\W|$) |
| + | /x) { |
| + | checkwarn("BANNEDPREPROC", |
| + | $line, length($1), $file, $ol, |
| + | "use of $2 is banned from preprocessor lines" . |
| + | (($2 eq "WIN32") ? ", use _WIN32 instead" : "")); |
| + | } |
| + | } |
| $line++; | |
| $prevp = $prep; | |
| $prevl = $ol if(!$prep); | |
| @@ -41,7 +41,7 @@ | |
| static char *parse_filename(const char *ptr, size_t len); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #define BOLD "\x1b[1m" | |
| #define BOLDOFF "\x1b[22m" | |
| #else | |
| @@ -87,7 +87,7 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata) | |
| } | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* Discard incomplete UTF-8 sequence buffered from body */ | |
| if(outs->utf8seq[0]) | |
| memset(outs->utf8seq, 0, sizeof(outs->utf8seq)); | |
| @@ -213,7 +213,7 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata) | |
| return CURL_WRITEFUNC_ERROR; | |
| if(hdrcbdata->global->isatty && | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| tool_term_has_bold && | |
| #endif | |
| hdrcbdata->global->styled_output) | |
| @@ -304,7 +304,7 @@ static char *parse_filename(const char *ptr, size_t len) | |
| if(copy != p) | |
| memmove(copy, p, strlen(p) + 1); | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| { | |
| char *sanitized; | |
| SANITIZEcode sc = sanitize_file_name(&sanitized, copy, 0); | |
| @@ -313,7 +313,7 @@ static char *parse_filename(const char *ptr, size_t len) | |
| return NULL; | |
| copy = sanitized; | |
| } | |
| - | #endif /* MSDOS || WIN32 */ |
| + | #endif /* _WIN32 || MSDOS */ |
| /* in case we built debug enabled, we allow an environment variable | |
| * named CURL_TESTDIR to prefix the given file name to put it into a | |
| @@ -249,7 +249,7 @@ void progressbarinit(struct ProgressData *bar, | |
| struct winsize ts; | |
| if(!ioctl(STDIN_FILENO, TIOCGWINSZ, &ts)) | |
| cols = ts.ws_col; | |
| - | #elif defined(WIN32) |
| + | #elif defined(_WIN32) |
| { | |
| HANDLE stderr_hnd = GetStdHandle(STD_ERROR_HANDLE); | |
| CONSOLE_SCREEN_BUFFER_INFO console_info; | |
| @@ -62,7 +62,7 @@ size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata) | |
| if(msdelta > config->timeout_ms) | |
| /* timeout */ | |
| return 0; | |
| - | #ifndef WIN32 |
| + | #ifndef _WIN32 |
| /* this logic waits on read activity on a file descriptor that is not a | |
| socket which makes it not work with select() on Windows */ | |
| else { | |
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "tool_setup.h" | |
| - | #if defined(WIN32) && !defined(HAVE_FTRUNCATE) |
| + | #if defined(_WIN32) && !defined(HAVE_FTRUNCATE) |
| int tool_ftruncate64(int fd, curl_off_t where); | |
| @@ -35,7 +35,7 @@ int tool_ftruncate64(int fd, curl_off_t where); | |
| #define HAVE_FTRUNCATE 1 | |
| #define USE_TOOL_FTRUNCATE 1 | |
| - | #endif /* WIN32 && ! HAVE_FTRUNCATE */ |
| + | #endif /* _WIN32 && ! HAVE_FTRUNCATE */ |
| /* | |
| ** callback for CURLOPT_SEEKFUNCTION | |
| @@ -44,7 +44,7 @@ | |
| #ifndef O_BINARY | |
| #define O_BINARY 0 | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #define OPENMODE S_IREAD | S_IWRITE | |
| #else | |
| #define OPENMODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH | |
| @@ -159,7 +159,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata) | |
| struct OperationConfig *config = per->config; | |
| size_t bytes = sz * nmemb; | |
| bool is_tty = config->global->isatty; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| CONSOLE_SCREEN_BUFFER_INFO console_info; | |
| intptr_t fhnd; | |
| #endif | |
| @@ -231,7 +231,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata) | |
| } | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| fhnd = _get_osfhandle(fileno(outs->stream)); | |
| /* if windows console then UTF-8 must be converted to UTF-16 */ | |
| if(isatty(fileno(outs->stream)) && | |
| @@ -25,7 +25,7 @@ | |
| #include <sys/stat.h> | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # include <direct.h> | |
| #endif | |
| @@ -38,7 +38,7 @@ | |
| #include "memdebug.h" /* keep this as LAST include */ | |
| - | #if defined(WIN32) || (defined(MSDOS) && !defined(__DJGPP__)) |
| + | #if defined(_WIN32) || (defined(MSDOS) && !defined(__DJGPP__)) |
| # define mkdir(x,y) (mkdir)((x)) | |
| # ifndef F_OK | |
| # define F_OK 0 | |
| @@ -88,7 +88,7 @@ static void show_dir_errno(struct GlobalConfig *global, const char *name) | |
| * should create all the dir* automagically | |
| */ | |
| - | #if defined(WIN32) || defined(__DJGPP__) |
| + | #if defined(_WIN32) || defined(__DJGPP__) |
| /* systems that may use either or when specifying a path */ | |
| #define PATH_DELIMITERS "\\/" | |
| #else | |
| @@ -132,7 +132,7 @@ CURLcode create_dir_hierarchy(const char *outfile, struct GlobalConfig *global) | |
| msnprintf(&dirbuildup[dlen], outlen - dlen, "%s%s", DIR_CHAR, tempdir); | |
| else { | |
| if(outdup == tempdir) { | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| /* Skip creating a drive's current directory. | |
| It may seem as though that would harmlessly fail but it could be | |
| a corner case if X: did not exist, since we would be creating it | |
| @@ -23,13 +23,13 @@ | |
| ***************************************************************************/ | |
| #include "tool_setup.h" | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME) | |
| # include <libgen.h> | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # include <stdlib.h> | |
| # include <tlhelp32.h> | |
| # include "tool_cfgable.h" | |
| @@ -42,7 +42,7 @@ | |
| #include "curlx.h" | |
| #include "memdebug.h" /* keep this as LAST include */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # undef PATH_MAX | |
| # define PATH_MAX MAX_PATH | |
| #endif | |
| @@ -55,7 +55,7 @@ | |
| # endif | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # define _use_lfn(f) (1) /* long file names always available */ | |
| #elif !defined(__DJGPP__) || (__DJGPP__ < 2) /* DJGPP 2.0 has _use_lfn() */ | |
| # define _use_lfn(f) (0) /* long file names never available */ | |
| @@ -597,7 +597,7 @@ char **__crt0_glob_function(char *arg) | |
| #endif /* MSDOS && (__DJGPP__ || __GO32__) */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* | |
| * Function to find CACert bundle on a Win32 platform using SearchPath. | |
| @@ -791,6 +791,6 @@ CURLcode win32_init(void) | |
| return CURLE_OK; | |
| } | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| - | #endif /* MSDOS || WIN32 */ |
| + | #endif /* _WIN32 || MSDOS */ |
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "tool_setup.h" | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| #define SANITIZE_ALLOW_COLONS (1<<0) /* Allow colons */ | |
| #define SANITIZE_ALLOW_PATH (1<<1) /* Allow path separators and colons */ | |
| @@ -57,7 +57,7 @@ char **__crt0_glob_function(char *arg); | |
| #endif /* MSDOS && (__DJGPP__ || __GO32__) */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| CURLcode FindWin32CACert(struct OperationConfig *config, | |
| curl_sslbackend backend, | |
| @@ -65,8 +65,8 @@ CURLcode FindWin32CACert(struct OperationConfig *config, | |
| struct curl_slist *GetLoadedModulePaths(void); | |
| CURLcode win32_init(void); | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| - | #endif /* MSDOS || WIN32 */ |
| + | #endif /* _WIN32 || MSDOS */ |
| #endif /* HEADER_CURL_TOOL_DOSWIN_H */ | |
| @@ -41,7 +41,7 @@ int getfiletime(const char *filename, struct GlobalConfig *global, | |
| /* Windows stat() may attempt to adjust the unix GMT file time by a daylight | |
| saving time offset and since it's GMT that is bad behavior. When we have | |
| access to a 64-bit type we can bypass stat and get the times directly. */ | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| HANDLE hfile; | |
| TCHAR *tchar_filename = curlx_convert_UTF8_to_tchar((char *)filename); | |
| @@ -87,7 +87,7 @@ int getfiletime(const char *filename, struct GlobalConfig *global, | |
| return rc; | |
| } | |
| - | #if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || defined(WIN32) |
| + | #if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || defined(_WIN32) |
| void setfiletime(curl_off_t filetime, const char *filename, | |
| struct GlobalConfig *global) | |
| { | |
| @@ -95,7 +95,7 @@ void setfiletime(curl_off_t filetime, const char *filename, | |
| /* Windows utime() may attempt to adjust the unix GMT file time by a daylight | |
| saving time offset and since it's GMT that is bad behavior. When we have | |
| access to a 64-bit type we can bypass utime and set the times directly. */ | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| HANDLE hfile; | |
| TCHAR *tchar_filename = curlx_convert_UTF8_to_tchar((char *)filename); | |
| @@ -153,4 +153,4 @@ void setfiletime(curl_off_t filetime, const char *filename, | |
| } | |
| } | |
| #endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \ | |
| - | defined(WIN32) */ |
| + | defined(_WIN32) */ |
| @@ -31,12 +31,12 @@ int getfiletime(const char *filename, struct GlobalConfig *global, | |
| curl_off_t *stamp); | |
| #if defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \ | |
| - | (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) |
| + | (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) Curl_nop_stmt | |
| #endif /* defined(HAVE_UTIME) || defined(HAVE_UTIMES) || \ | |
| - | (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */ |
| + | (defined(_WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */ |
| #endif /* HEADER_CURL_TOOL_FILETIME_H */ | |
| @@ -53,7 +53,7 @@ static const struct finder conf_list[] = { | |
| { "CURL_HOME", NULL, FALSE }, | |
| { "XDG_CONFIG_HOME", NULL, FALSE }, /* index == 1, used in the code */ | |
| { "HOME", NULL, FALSE }, | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| { "USERPROFILE", NULL, FALSE }, | |
| { "APPDATA", NULL, FALSE }, | |
| { "USERPROFILE", "\\Application Data", FALSE}, | |
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "tool_setup.h" | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #define CURLRC_DOTSCORE 2 /* look for underscore-prefixed name too */ | |
| #else | |
| #define CURLRC_DOTSCORE 1 /* regular .curlrc check */ | |
| @@ -437,7 +437,7 @@ void parse_cert_parameter(const char *cert_parameter, | |
| needs to work. In order not to break compatibility, we still use : as | |
| separator, but we try to detect when it is used for a file name! On | |
| windows. */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if((param_place == &cert_parameter[1]) && | |
| (cert_parameter[2] == '\\' || cert_parameter[2] == '/') && | |
| (ISALPHA(cert_parameter[0])) ) { | |
| @@ -46,7 +46,7 @@ | |
| # include iodef | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| # include <conio.h> | |
| #endif | |
| @@ -94,7 +94,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) | |
| #define DONE | |
| #endif /* __VMS */ | |
| - | #if defined(WIN32) |
| + | #if defined(_WIN32) |
| char *getpass_r(const char *prompt, char *buffer, size_t buflen) | |
| { | |
| @@ -122,7 +122,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) | |
| return buffer; /* we always return success */ | |
| } | |
| #define DONE | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| #ifndef DONE /* not previously provided */ | |
| @@ -25,7 +25,7 @@ | |
| #include <sys/stat.h> | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <tchar.h> | |
| #endif | |
| @@ -235,7 +235,7 @@ int main(int argc, char *argv[]) | |
| tool_init_stderr(); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* Undocumented diagnostic option to list the full paths of all loaded | |
| modules. This is purposely pre-init. */ | |
| if(argc == 2 && !_tcscmp(argv[1], _T("--dump-module-paths"))) { | |
| @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) | |
| main_free(&global); | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* Flush buffers of all streams opened in write or update mode */ | |
| fflush(NULL); | |
| #endif | |
| @@ -463,7 +463,7 @@ static CURLcode post_per_transfer(struct GlobalConfig *global, | |
| } | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* Discard incomplete UTF-8 sequence buffered from body */ | |
| if(outs->utf8seq[0]) | |
| memset(outs->utf8seq, 0, sizeof(outs->utf8seq)); | |
| @@ -2636,7 +2636,7 @@ static CURLcode transfer_per_config(struct GlobalConfig *global, | |
| if(env) | |
| curl_free(env); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| else { | |
| result = FindWin32CACert(config, tls_backend_info->backend, | |
| TEXT("curl-ca-bundle.crt")); | |
| @@ -215,7 +215,7 @@ CURLcode get_url_file_name(char **filename, const char *url) | |
| if(!*filename) | |
| return CURLE_OUT_OF_MEMORY; | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| { | |
| char *sanitized; | |
| SANITIZEcode sc = sanitize_file_name(&sanitized, *filename, 0); | |
| @@ -227,7 +227,7 @@ CURLcode get_url_file_name(char **filename, const char *url) | |
| } | |
| *filename = sanitized; | |
| } | |
| - | #endif /* MSDOS || WIN32 */ |
| + | #endif /* _WIN32 || MSDOS */ |
| /* in case we built debug enabled, we allow an environment variable | |
| * named CURL_TESTDIR to prefix the given file name to put it into a | |
| @@ -46,7 +46,7 @@ static const char *unslashquote(const char *line, char *param); | |
| #define MAX_CONFIG_LINE_LENGTH (10*1024*1024) | |
| static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| static FILE *execpath(const char *filename, char **pathp) | |
| { | |
| static char filebuffer[512]; | |
| @@ -98,7 +98,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) | |
| } | |
| filename = pathalloc = curlrc; | |
| } | |
| - | #ifdef WIN32 /* Windows */ |
| + | #ifdef _WIN32 /* Windows */ |
| else { | |
| char *fullp; | |
| /* check for .curlrc then _curlrc in the dir of the executable */ | |
| @@ -71,7 +71,7 @@ struct OutStruct { | |
| FILE *stream; | |
| curl_off_t bytes; | |
| curl_off_t init; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| unsigned char utf8seq[5]; | |
| #endif | |
| }; | |
| @@ -66,7 +66,7 @@ extern FILE *tool_stderr; | |
| # include "tool_strdup.h" | |
| #endif | |
| - | #if defined(WIN32) && !defined(MSDOS) |
| + | #if defined(_WIN32) |
| /* set in win32_init() */ | |
| extern LARGE_INTEGER tool_freq; | |
| extern bool tool_isVistaOrGreater; | |
| @@ -47,7 +47,7 @@ void tool_go_sleep(long ms) | |
| { | |
| #if defined(MSDOS) | |
| delay(ms); | |
| - | #elif defined(WIN32) |
| + | #elif defined(_WIN32) |
| Sleep(ms); | |
| #elif defined(HAVE_POLL_FINE) | |
| (void)poll((void *)0, 0, (int)ms); | |
| @@ -702,7 +702,7 @@ CURLcode glob_match_url(char **result, char *filename, struct URLGlob *glob) | |
| if(curlx_dyn_addn(&dyn, "", 0)) | |
| return CURLE_OUT_OF_MEMORY; | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| { | |
| char *sanitized; | |
| SANITIZEcode sc = sanitize_file_name(&sanitized, curlx_dyn_ptr(&dyn), | |
| @@ -717,5 +717,5 @@ CURLcode glob_match_url(char **result, char *filename, struct URLGlob *glob) | |
| #else | |
| *result = curlx_dyn_ptr(&dyn); | |
| return CURLE_OK; | |
| - | #endif /* MSDOS || WIN32 */ |
| + | #endif /* _WIN32 || MSDOS */ |
| } | |
| @@ -31,7 +31,7 @@ | |
| #include "memdebug.h" /* keep this as LAST include */ | |
| - | #if defined(WIN32) && !defined(MSDOS) |
| + | #if defined(_WIN32) |
| /* In case of bug fix this function has a counterpart in timeval.c */ | |
| struct timeval tvnow(void) | |
| @@ -174,7 +174,7 @@ int main(int argc, char **argv) | |
| result = test(URL); | |
| fprintf(stderr, "Test ended with result %d\n", result); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* flush buffers of all streams regardless of mode */ | |
| _flushall(); | |
| #endif | |
| @@ -61,7 +61,7 @@ int test(char *URL) | |
| struct WriteThis pooh; | |
| if(!strcmp(URL, "check")) { | |
| - | #if (defined(WIN32) || defined(__CYGWIN__)) |
| + | #if (defined(_WIN32) || defined(__CYGWIN__)) |
| printf("Windows TCP does not deliver response data but reports " | |
| "CONNABORTED\n"); | |
| return 1; /* skip since test will fail on Windows without workaround */ | |
| @@ -110,7 +110,7 @@ int test(char *URL) | |
| curl_multi_fdset() doc. */ | |
| if(maxfd == -1) { | |
| - | #if defined(WIN32) || defined(_WIN32) |
| + | #if defined(_WIN32) |
| Sleep(100); | |
| rc = 0; | |
| #else | |
| @@ -319,7 +319,7 @@ static const struct testcase get_parts_list[] ={ | |
| "http | ftp.user | moo | [13] | example.com | [15] | /color/ | [16] | " | |
| "green?no-red", | |
| CURLU_GUESS_SCHEME, 0, CURLUE_OK }, | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| {"file:/C:\\programs\\foo", | |
| "file | [11] | [12] | [13] | [14] | [15] | C:\\programs\\foo | [16] | [17]", | |
| CURLU_DEFAULT_SCHEME, 0, CURLUE_OK}, | |
| @@ -25,7 +25,7 @@ | |
| #ifdef HAVE_INET_PTON | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <winsock2.h> | |
| #include <ws2tcpip.h> | |
| #include <windows.h> | |
| @@ -28,7 +28,7 @@ | |
| #define NUM_THREADS 100 | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #ifdef _WIN32_WCE | |
| static DWORD WINAPI run_thread(LPVOID ptr) | |
| #else | |
| @@ -42,7 +42,7 @@ | |
| #define NUM_OPEN (FD_SETSIZE + 10) | |
| #define NUM_NEEDED (NUM_OPEN + SAFETY_MARGIN) | |
| - | #if defined(WIN32) || defined(_WIN32) || defined(MSDOS) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| #define DEV_NULL "NUL" | |
| #else | |
| #define DEV_NULL "/dev/null" | |
| @@ -42,7 +42,7 @@ | |
| #define SAFETY_MARGIN (11) | |
| - | #if defined(WIN32) || defined(_WIN32) || defined(MSDOS) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| #define DEV_NULL "NUL" | |
| #else | |
| #define DEV_NULL "/dev/null" | |
| @@ -215,7 +215,7 @@ int test(char *URL) | |
| mres = curl_multi_fdset(multi, &fdread, &fdwrite, &fdexcept, &maxfd); | |
| if(mres) | |
| break; | |
| - | #if defined(WIN32) || defined(_WIN32) |
| + | #if defined(_WIN32) |
| if(maxfd == -1) | |
| Sleep(100); | |
| else | |
| @@ -42,7 +42,7 @@ | |
| #include "curl_printf.h" | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #define sleep(sec) Sleep ((sec)*1000) | |
| #endif | |
| @@ -26,7 +26,7 @@ | |
| #include "testutil.h" | |
| #include "memdebug.h" | |
| - | #if defined(WIN32) && !defined(MSDOS) |
| + | #if defined(_WIN32) |
| struct timeval tutil_tvnow(void) | |
| { | |
| @@ -130,7 +130,7 @@ double tutil_tvdiff_secs(struct timeval newer, struct timeval older) | |
| return (double)(newer.tv_usec-older.tv_usec)/1000000.0; | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| HMODULE win32_load_system_library(const TCHAR *filename) | |
| { | |
| size_t filenamelen = _tcslen(filename); | |
| @@ -42,7 +42,7 @@ long tutil_tvdiff(struct timeval t1, struct timeval t2); | |
| */ | |
| double tutil_tvdiff_secs(struct timeval t1, struct timeval t2); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| HMODULE win32_load_system_library(const TCHAR *filename); | |
| #endif | |
| @@ -60,7 +60,7 @@ curl_free_callback Curl_cfree = (curl_free_callback)free; | |
| curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc; | |
| curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)strdup; | |
| curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc; | |
| - | #if defined(WIN32) && defined(UNICODE) |
| + | #if defined(_WIN32) && defined(UNICODE) |
| curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)_wcsdup; | |
| #endif | |
| @@ -1016,7 +1016,7 @@ int main(int argc, char *argv[]) | |
| msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/mqtt-%s.lock", | |
| logdir, SERVERLOGS_LOCKDIR, ipv_inuse); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) | |
| return 1; | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| #endif | |
| @@ -1150,7 +1150,7 @@ int main(int argc, char *argv[]) | |
| msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/rtsp-%s.lock", | |
| logdir, SERVERLOGS_LOCKDIR, ipv_inuse); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| #endif | |
| @@ -152,7 +152,7 @@ enum sockmode { | |
| ACTIVE_DISCONNECT /* as a client, disconnected from server */ | |
| }; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* | |
| * read-wrapper to support reading from stdin on Windows. | |
| */ | |
| @@ -1461,7 +1461,7 @@ int main(int argc, char *argv[]) | |
| } | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| @@ -1076,7 +1076,7 @@ int main(int argc, char *argv[]) | |
| } | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| @@ -2119,7 +2119,7 @@ int main(int argc, char *argv[]) | |
| logdir, SERVERLOGS_LOCKDIR, protocol_type, | |
| is_proxy ? "-proxy" : "", socket_type); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| #endif | |
| @@ -453,7 +453,7 @@ static ssize_t write_behind(struct testcase *test, int convert) | |
| if(!test->ofile) { | |
| char outfile[256]; | |
| msnprintf(outfile, sizeof(outfile), "%s/upload.%ld", logdir, test->testno); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| test->ofile = open(outfile, O_CREAT|O_RDWR|O_BINARY, 0777); | |
| #else | |
| test->ofile = open(outfile, O_CREAT|O_RDWR, 0777); | |
| @@ -642,7 +642,7 @@ int main(int argc, char **argv) | |
| msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/tftp-%s.lock", | |
| logdir, SERVERLOGS_LOCKDIR, ipv_inuse); | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| win32_init(); | |
| atexit(win32_cleanup); | |
| #endif | |
| @@ -144,7 +144,7 @@ void logmsg(const char *msg, ...) | |
| } | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* use instead of strerror() on generic Windows */ | |
| static const char *win32_strerror(int err, char *buf, size_t buflen) | |
| { | |
| @@ -208,7 +208,7 @@ const char *sstrerror(int err) | |
| static char buf[512]; | |
| return win32_strerror(err, buf, sizeof(buf)); | |
| } | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| /* set by the main code to point to where the test dir is */ | |
| const char *path = "."; | |
| @@ -292,7 +292,7 @@ curl_off_t our_getpid(void) | |
| curl_off_t pid; | |
| pid = (curl_off_t)getpid(); | |
| - | #if defined(WIN32) || defined(_WIN32) |
| + | #if defined(_WIN32) || defined(_WIN32) |
| /* store pid + 65536 to avoid conflict with Cygwin/msys PIDs, see also: | |
| * - https://cygwin.com/git/?p=newlib-cygwin.git;a=commit; ↵ | |
| * h=b5e1003722cb14235c4f166be72c09acdffc62ea | |
| @@ -378,7 +378,7 @@ void clear_advisor_read_lock(const char *filename) | |
| } | |
| - | #if defined(WIN32) && !defined(MSDOS) |
| + | #if defined(_WIN32) && !defined(MSDOS) |
| static struct timeval tvnow(void) | |
| { | |
| @@ -501,11 +501,11 @@ static SIGHANDLER_T old_sigint_handler = SIG_ERR; | |
| static SIGHANDLER_T old_sigterm_handler = SIG_ERR; | |
| #endif | |
| - | #if defined(SIGBREAK) && defined(WIN32) |
| + | #if defined(SIGBREAK) && defined(_WIN32) |
| static SIGHANDLER_T old_sigbreak_handler = SIG_ERR; | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #ifdef _WIN32_WCE | |
| static DWORD thread_main_id = 0; | |
| #else | |
| @@ -521,7 +521,7 @@ volatile int got_exit_signal = 0; | |
| /* if next is set indicates the first signal handled in exit_signal_handler */ | |
| volatile int exit_signal = 0; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* event which if set indicates that the program should finish */ | |
| HANDLE exit_event = NULL; | |
| #endif | |
| @@ -538,7 +538,7 @@ static void exit_signal_handler(int signum) | |
| if(got_exit_signal == 0) { | |
| got_exit_signal = 1; | |
| exit_signal = signum; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if(exit_event) | |
| (void)SetEvent(exit_event); | |
| #endif | |
| @@ -547,7 +547,7 @@ static void exit_signal_handler(int signum) | |
| errno = old_errno; | |
| } | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* CTRL event handler for Windows Console applications to simulate | |
| * SIGINT, SIGTERM and SIGBREAK on CTRL events and trigger signal handler. | |
| * | |
| @@ -698,7 +698,7 @@ static SIGHANDLER_T set_signal(int signum, SIGHANDLER_T handler, | |
| void install_signal_handlers(bool keep_sigalrm) | |
| { | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #ifdef _WIN32_WCE | |
| typedef HANDLE curl_win_thread_handle_t; | |
| #else | |
| @@ -744,13 +744,13 @@ void install_signal_handlers(bool keep_sigalrm) | |
| if(old_sigterm_handler == SIG_ERR) | |
| logmsg("cannot install SIGTERM handler: %s", strerror(errno)); | |
| #endif | |
| - | #if defined(SIGBREAK) && defined(WIN32) |
| + | #if defined(SIGBREAK) && defined(_WIN32) |
| /* handle SIGBREAK signal with our exit_signal_handler */ | |
| old_sigbreak_handler = set_signal(SIGBREAK, exit_signal_handler, TRUE); | |
| if(old_sigbreak_handler == SIG_ERR) | |
| logmsg("cannot install SIGBREAK handler: %s", strerror(errno)); | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| if(!SetConsoleCtrlHandler(ctrl_event_handler, TRUE)) | |
| logmsg("cannot install CTRL event handler"); | |
| #ifdef _WIN32_WCE | |
| @@ -792,11 +792,11 @@ void restore_signal_handlers(bool keep_sigalrm) | |
| if(SIG_ERR != old_sigterm_handler) | |
| (void) set_signal(SIGTERM, old_sigterm_handler, FALSE); | |
| #endif | |
| - | #if defined(SIGBREAK) && defined(WIN32) |
| + | #if defined(SIGBREAK) && defined(_WIN32) |
| if(SIG_ERR != old_sigbreak_handler) | |
| (void) set_signal(SIGBREAK, old_sigbreak_handler, FALSE); | |
| #endif | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| (void)SetConsoleCtrlHandler(ctrl_event_handler, FALSE); | |
| if(thread_main_window && thread_main_id) { | |
| if(PostThreadMessage(thread_main_id, WM_APP, 0, 0)) { | |
| @@ -846,7 +846,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket, | |
| return rc; | |
| } | |
| /* socket server is not alive, now check if it was actually a socket. */ | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* Windows does not have lstat function. */ | |
| rc = curlx_win32_stat(unix_socket, &statbuf); | |
| #else | |
| @@ -41,7 +41,7 @@ extern const char *serverlogfile; | |
| extern const char *cmdfile; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| #include <process.h> | |
| #include <fcntl.h> | |
| @@ -54,10 +54,10 @@ void win32_perror(const char *msg); | |
| void win32_init(void); | |
| void win32_cleanup(void); | |
| const char *sstrerror(int err); | |
| - | #else /* WIN32 */ |
| + | #else /* _WIN32 */ |
| #define sstrerror(e) strerror(e) | |
| - | #endif /* WIN32 */ |
| + | #endif /* _WIN32 */ |
| /* fopens the test case file */ | |
| FILE *test2fopen(long testno, const char *logdir); | |
| @@ -75,7 +75,7 @@ extern volatile int got_exit_signal; | |
| /* global variable which if set indicates the first signal handled */ | |
| extern volatile int exit_signal; | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| /* global event which if set indicates that the program should finish */ | |
| extern HANDLE exit_event; | |
| #endif | |
| @@ -61,7 +61,7 @@ UNITTEST_START | |
| "pkcs11:foobar", "pkcs11:foobar", NULL, | |
| "PKCS11:foobar", "PKCS11:foobar", NULL, | |
| "PkCs11:foobar", "PkCs11:foobar", NULL, | |
| - | #ifdef WIN32 |
| + | #ifdef _WIN32 |
| "c:\\foo:bar:baz", "c:\\foo", "bar:baz", | |
| "c:\\foo\\:bar:baz", "c:\\foo:bar", "baz", | |
| "c:\\foo\\\\:bar:baz", "c:\\foo\\", "bar:baz", | |
| @@ -42,7 +42,7 @@ static void unit_stop(void) | |
| } | |
| - | #if defined(MSDOS) || defined(WIN32) |
| + | #if defined(_WIN32) || defined(MSDOS) |
| static char *getflagstr(int flags) | |
| { | |
| @@ -353,6 +353,6 @@ UNITTEST_START | |
| { | |
| fprintf(stderr, "Skipped test not for this platform\n"); | |
| } | |
| - | #endif /* MSDOS || WIN32 */ |
| + | #endif /* _WIN32 || MSDOS */ |
| UNITTEST_STOP | |