From f37e391fa8a6fd15c6c4be000237a66804fa9b5c Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 30 Aug 2020 07:43:32 +0200 Subject: [PATCH] dummy.c: Conform to exact prototypes Apparently certain toolchains complain if the symbols in dummy.c do not exactly match their declarations. This should not be a problem unless the compiler has enabled a lot of warnings, and is treating those warnings as errors, (which is inadvisable except under very special circumstances). However, it appears that some people are doing that. This change ensures that they are identical. --- src/ui/gui/dummy.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/ui/gui/dummy.c b/src/ui/gui/dummy.c index f103b7d4e4..51c3e2da9f 100644 --- a/src/ui/gui/dummy.c +++ b/src/ui/gui/dummy.c @@ -28,38 +28,33 @@ #include +#include "libpspp/compiler.h" +#include "data/variable.h" + +#include "t-test-options.h" #include "src/language/stats/chart-category.h" +#include "src/language/stats/aggregate.h" const GEnumValue align[1]; const GEnumValue measure[1]; const GEnumValue role[1]; -const int N_AG_FUNCS = 0; -const struct ag_func ag_func[1]; - -int F_8_0; - -int var_is_numeric (void); -int tt_options_dialog_run (void); -int agr_func_tab (void); - -int -var_is_numeric () +bool +var_is_numeric (const struct variable *v UNUSED) { assert (0); return -1; } -int -tt_options_dialog_run () +void +tt_options_dialog_run (struct tt_options_dialog *x UNUSED) { assert (0); - return -1; } -int -agr_func_tab () -{ - assert (0); - return -1; -} +const struct agr_func agr_func_tab[] = + { + }; + +const struct ag_func ag_func[] = {}; +const int N_AG_FUNCS = 1; -- 2.30.2