Skip to content

Commit 0d07e06

Browse files
ramsay-jonesgitster
authored andcommitted
meson.build: remove -DCURL_DISABLE_TYPECHECK
Commit 9371322 ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 683c54c commit 0d07e06

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,6 @@ if curl.found()
966966
# Most executables don't have to link against libcurl, but we still need its
967967
# include directories so that we can resolve LIBCURL_VERSION in "help.c".
968968
libgit_dependencies += curl.partial_dependency(includes: true)
969-
libgit_c_args += '-DCURL_DISABLE_TYPECHECK'
970969
build_options_config.set('NO_CURL', '')
971970
else
972971
libgit_c_args += '-DNO_CURL'

0 commit comments

Comments
 (0)