4b4637a445
Viktor Szakats
2026-02-20
Subject
build: disable typecheck via the command-line instead of `curl_config.h`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMakeLists.txt+5 -0
| @@ -504,6 +504,11 @@ mark_as_advanced(CURL_DISABLE_TYPECHECK) | |
| option(CURL_DISABLE_VERBOSE_STRINGS "Disable verbose strings" OFF) | |
| mark_as_advanced(CURL_DISABLE_VERBOSE_STRINGS) | |
| + | if(CURL_DISABLE_TYPECHECK) |
| + | # Set it via the command-line to make it apply to examples also. |
| + | set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "CURL_DISABLE_TYPECHECK") |
| + | endif() |
| + | |
| if(CURL_DISABLE_HTTP) | |
| set(CURL_DISABLE_ALTSVC ON) | |
| set(CURL_DISABLE_HSTS ON) | |
configure.ac+2 -1
| @@ -4338,7 +4338,8 @@ AS_HELP_STRING([--disable-typecheck],[Disable type checking]), | |
| [ case "$enableval" in | |
| no) | |
| AC_MSG_RESULT(no) | |
| - | AC_DEFINE(CURL_DISABLE_TYPECHECK, 1, [to disable type checking]) |
| + | dnl Set it via the command-line to make it apply to examples also. |
| + | CPPFLAGS="$CPPFLAGS -DCURL_DISABLE_TYPECHECK" |
| curl_typecheck_msg="no" | |
| ;; | |
| *) | |
lib/curl_config-cmake.h.in+0 -3
| @@ -163,9 +163,6 @@ | |
| /* disables TFTP */ | |
| #cmakedefine CURL_DISABLE_TFTP 1 | |
| - | /* disables curl_easy_setopt()/curl_easy_getinfo() type checking */ |
| - | #cmakedefine CURL_DISABLE_TYPECHECK 1 |
| - | |
| /* disables verbose strings */ | |
| #cmakedefine CURL_DISABLE_VERBOSE_STRINGS 1 | |
tests/test1165.pl+11 -4
| @@ -47,7 +47,9 @@ sub scanconf { | |
| while(<S>) { | |
| if(/(CURL_DISABLE_[A-Z0-9_]+)/g) { | |
| my ($sym)=($1); | |
| - | $disable{$sym} = 1; |
| + | if(not $sym =~ /^(CURL_DISABLE_TYPECHECK)$/) { |
| + | $disable{$sym} = 1; |
| + | } |
| } | |
| } | |
| close S; | |
| @@ -70,7 +72,7 @@ sub scanconf_cmake { | |
| while(<S>) { | |
| if(/(CURL_DISABLE_[A-Z0-9_]+)/g) { | |
| my ($sym)=($1); | |
| - | if(not $sym =~ /^(CURL_DISABLE_INSTALL|CURL_DISABLE_SRP)$/) { |
| + | if(not $sym =~ /^(CURL_DISABLE_INSTALL|CURL_DISABLE_SRP|CURL_DISABLE_TYPECHECK)$/) { |
| $hashr->{$sym} = 1; | |
| } | |
| } | |
| @@ -86,7 +88,10 @@ sub scan_cmake_config_h { | |
| scanconf_cmake(\%disable_cmake_config_h, "$root/lib/curl_config-cmake.h.in"); | |
| } | |
| - | my %whitelisted = ('CURL_DISABLE_DEPRECATION' => 1); |
| + | my %whitelisted = ( |
| + | 'CURL_DISABLE_DEPRECATION' => 1, |
| + | 'CURL_DISABLE_TYPECHECK' => 1, |
| + | ); |
| sub scan_file { | |
| my ($source)=@_; | |
| @@ -128,7 +133,9 @@ sub scan_docs { | |
| $line++; | |
| if(/^## `(CURL_DISABLE_[A-Z0-9_]+)`/g) { | |
| my ($sym)=($1); | |
| - | $docs{$sym} = $line; |
| + | if(not $sym =~ /^(CURL_DISABLE_TYPECHECK)$/) { |
| + | $docs{$sym} = $line; |
| + | } |
| } | |
| } | |
| close F; | |