aboutsummaryrefslogtreecommitdiffstats
diff options
authorRamsay Jones <ramsay@ramsayjones.plus.com>2025-04-17 00:18:22 +0100
committerJunio C Hamano <gitster@pobox.com>2025-04-16 20:43:43 -0700
commit0d07e0617c0de87eae402c57c20ed137abeeeb08 (patch)
tree9999ff3e760df4272dc405efcb248fb7dffd58cc
parent683c54c999c301c2cd6f715c411407c413b1d84e (diff)
downloadgit-0d07e0617c0de87eae402c57c20ed137abeeeb08.tar.gz
meson.build: remove -DCURL_DISABLE_TYPECHECK
Commit 9371322a60 ("sparse: suppress some \"using sizeof on a function\" warnings", 2013-10-06) used target-specific variable assignments to add -DCURL_DISABLE_TYPECHECK to SPARSE_FLAGS for each of the files affected by the "typecheck-gcc.h" warnings. (http-push.c, http.c, http-walker.c and remote-curl.c). These warnings are only issued by sparse, and not by gcc, so we do not want to disable the 'type checking' for non-sparse targets. The meson build does not provide any sparse targets, so there is no need to use the CURL_DISABLE_TYPECHECK preprocessor flag with the c compiler. In order to re-enable the curl 'type checking' in the meson build, remove the assignment of -DCURL_DISABLE_TYPECHECK to libgit_c_args. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--meson.build1
1 files changed, 0 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index efe2871c9d..88a29fd043 100644
--- a/meson.build
+++ b/meson.build
@@ -966,7 +966,6 @@ if curl.found()
# Most executables don't have to link against libcurl, but we still need its
# include directories so that we can resolve LIBCURL_VERSION in "help.c".
libgit_dependencies += curl.partial_dependency(includes: true)
- libgit_c_args += '-DCURL_DISABLE_TYPECHECK'
build_options_config.set('NO_CURL', '')
else
libgit_c_args += '-DNO_CURL'