From 8c09233c22d0bb6a48570647415ed3389a4e6f5d Mon Sep 17 00:00:00 2001 From: Morten Welinder Date: Tue, 15 May 2018 22:27:09 -0400 Subject: [PATCH] Compilation: fix up tools includes. --- src/Makefile.am | 1 - src/application.c | 1 - src/commands.c | 6 +++--- src/dialogs/dialog-advanced-filter.c | 4 ++-- src/dialogs/dialog-analysis-tool-chi-squared.c | 4 ++-- src/dialogs/dialog-analysis-tool-frequency.c | 4 ++-- src/dialogs/dialog-analysis-tool-kaplan-meier.c | 4 ++-- src/dialogs/dialog-analysis-tool-normality.c | 4 ++-- src/dialogs/dialog-analysis-tool-one-mean.c | 4 ++-- src/dialogs/dialog-analysis-tool-principal-components.c | 4 ++-- src/dialogs/dialog-analysis-tool-sign-test.c | 6 +++--- src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c | 4 ++-- src/dialogs/dialog-analysis-tools.c | 8 ++++---- src/dialogs/dialog-fill-series.c | 2 +- src/dialogs/dialog-goal-seek.c | 2 +- src/dialogs/dialog-random-generator-cor.c | 2 +- src/dialogs/dialog-random-generator.c | 2 +- src/dialogs/dialog-scenarios.c | 4 ++-- src/dialogs/dialog-shuffle.c | 2 +- src/dialogs/dialog-simulation.c | 2 +- src/dialogs/dialog-solver.c | 2 +- src/sheet.c | 2 +- src/tools/analysis-anova.h | 2 +- src/tools/analysis-auto-expression.h | 2 +- src/tools/analysis-chi-squared.h | 2 +- src/tools/analysis-exp-smoothing.h | 2 +- src/tools/analysis-frequency.h | 2 +- src/tools/analysis-histogram.h | 2 +- src/tools/analysis-kaplan-meier.h | 2 +- src/tools/analysis-normality.h | 2 +- src/tools/analysis-one-mean-test.h | 2 +- src/tools/analysis-principal-components.h | 2 +- src/tools/analysis-sign-test.h | 2 +- src/tools/analysis-signed-rank-test.h | 2 +- src/tools/analysis-tools.h | 2 +- src/tools/analysis-wilcoxon-mann-whitney.h | 2 +- src/tools/dao.c | 2 +- src/tools/data-shuffling.c | 3 +-- src/tools/data-shuffling.h | 2 +- src/tools/fill-series.c | 3 +-- src/tools/fill-series.h | 2 +- src/tools/filter.h | 2 +- src/tools/gnm-solver.c | 2 +- src/tools/random-generator-cor.c | 4 ++-- src/tools/random-generator-cor.h | 2 +- src/tools/random-generator.h | 2 +- src/tools/scenarios.c | 2 +- src/tools/simulation.h | 2 +- src/tools/tabulate.h | 2 +- src/tools/tools.h | 2 +- 50 files changed, 65 insertions(+), 69 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ffb19ba3e..88dd6bf48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,7 +34,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(srcdir) \ -I$(srcdir)/widgets \ - -I$(srcdir)/tools \ $(GNUMERIC_CFLAGS) # A hint is needed to build these headers first: diff --git a/src/application.c b/src/application.c index cc05afe96..d1e9c4d82 100644 --- a/src/application.c +++ b/src/application.c @@ -19,7 +19,6 @@ #include "sheet-view.h" #include "sheet-private.h" #include "sheet-object.h" -#include "auto-correct.h" #include "gutils.h" #include "ranges.h" #include "sheet-object.h" diff --git a/src/commands.c b/src/commands.c index 0a018f317..8db0be440 100644 --- a/src/commands.c +++ b/src/commands.c @@ -55,7 +55,7 @@ #include "selection.h" #include "colrow.h" #include "style-border.h" -#include "auto-correct.h" +#include "tools/auto-correct.h" #include "sheet-autofill.h" #include "mstyle.h" #include "search.h" @@ -74,8 +74,8 @@ #include "auto-format.h" #include "tools/dao.h" #include "gnumeric-conf.h" -#include "scenarios.h" -#include "data-shuffling.h" +#include "tools/scenarios.h" +#include "tools/data-shuffling.h" #include "tools/tabulate.h" #include "wbc-gtk.h" #include "undo.h" diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c index 7f94d4ab9..1f3eba9ee 100644 --- a/src/dialogs/dialog-advanced-filter.c +++ b/src/dialogs/dialog-advanced-filter.c @@ -40,8 +40,8 @@ #include #include #include -#include "filter.h" -#include "analysis-tools.h" +#include "tools/filter.h" +#include "tools/analysis-tools.h" #include "commands.h" diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c index 85e07580e..f2b4cc8ed 100644 --- a/src/dialogs/dialog-analysis-tool-chi-squared.c +++ b/src/dialogs/dialog-analysis-tool-chi-squared.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-chi-squared.h" -#include "analysis-tools.h" +#include "tools/analysis-chi-squared.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c index dd61f6de6..0822b608d 100644 --- a/src/dialogs/dialog-analysis-tool-frequency.c +++ b/src/dialogs/dialog-analysis-tool-frequency.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-frequency.h" -#include "analysis-tools.h" +#include "tools/analysis-frequency.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c index 424432b6d..5d86eea28 100644 --- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c +++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-kaplan-meier.h" -#include "analysis-tools.h" +#include "tools/analysis-kaplan-meier.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c index 68c240e8c..c69ca90a1 100644 --- a/src/dialogs/dialog-analysis-tool-normality.c +++ b/src/dialogs/dialog-analysis-tool-normality.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-normality.h" -#include "analysis-tools.h" +#include "tools/analysis-normality.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c index fcdd72937..311313717 100644 --- a/src/dialogs/dialog-analysis-tool-one-mean.c +++ b/src/dialogs/dialog-analysis-tool-one-mean.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-one-mean-test.h" -#include "analysis-tools.h" +#include "tools/analysis-one-mean-test.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c b/src/dialogs/dialog-analysis-tool-principal-components.c index 8abcd449e..8bcb6982d 100644 --- a/src/dialogs/dialog-analysis-tool-principal-components.c +++ b/src/dialogs/dialog-analysis-tool-principal-components.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-principal-components.h" -#include "analysis-tools.h" +#include "tools/analysis-principal-components.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c index 1da143f5a..194a20bab 100644 --- a/src/dialogs/dialog-analysis-tool-sign-test.c +++ b/src/dialogs/dialog-analysis-tool-sign-test.c @@ -25,9 +25,9 @@ #include #include #include "dialogs.h" -#include "analysis-sign-test.h" -#include "analysis-signed-rank-test.h" -#include "analysis-tools.h" +#include "tools/analysis-sign-test.h" +#include "tools/analysis-signed-rank-test.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c index ca9af3760..ac302622e 100644 --- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c +++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c @@ -25,8 +25,8 @@ #include #include #include "dialogs.h" -#include "analysis-wilcoxon-mann-whitney.h" -#include "analysis-tools.h" +#include "tools/analysis-wilcoxon-mann-whitney.h" +#include "tools/analysis-tools.h" #include #include diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c index 71a3e0466..1613be170 100644 --- a/src/dialogs/dialog-analysis-tools.c +++ b/src/dialogs/dialog-analysis-tools.c @@ -25,10 +25,10 @@ #include #include #include "dialogs.h" -#include "analysis-tools.h" -#include "analysis-anova.h" -#include "analysis-histogram.h" -#include "analysis-exp-smoothing.h" +#include "tools/analysis-tools.h" +#include "tools/analysis-anova.h" +#include "tools/analysis-histogram.h" +#include "tools/analysis-exp-smoothing.h" #include #include diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c index dfe3dadee..34eafc511 100644 --- a/src/dialogs/dialog-fill-series.c +++ b/src/dialogs/dialog-fill-series.c @@ -47,7 +47,7 @@ #include #include -#include "fill-series.h" +#include "tools/fill-series.h" #define FILL_SERIES_KEY "fill-series-dialog" diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c index 43b4c2cd7..188fc494f 100644 --- a/src/dialogs/dialog-goal-seek.c +++ b/src/dialogs/dialog-goal-seek.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c index da6dfa7a6..27648bed0 100644 --- a/src/dialogs/dialog-random-generator-cor.c +++ b/src/dialogs/dialog-random-generator-cor.c @@ -26,7 +26,7 @@ #include "dialogs.h" #include "help.h" #include "dialogs/tool-dialogs.h" -#include "random-generator-cor.h" +#include "tools/random-generator-cor.h" #include #include diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c index d9815a45f..9e6177362 100644 --- a/src/dialogs/dialog-random-generator.c +++ b/src/dialogs/dialog-random-generator.c @@ -27,7 +27,7 @@ #include "dialogs.h" #include "help.h" #include "dialogs/tool-dialogs.h" -#include "random-generator.h" +#include "tools/random-generator.h" #include #include diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c index 342cc1b65..d68c45881 100644 --- a/src/dialogs/dialog-scenarios.c +++ b/src/dialogs/dialog-scenarios.c @@ -36,8 +36,8 @@ #include #include #include -#include -#include "scenarios.h" +#include +#include "tools/scenarios.h" #include #include diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c index 1a30fc281..de6f0f298 100644 --- a/src/dialogs/dialog-shuffle.c +++ b/src/dialogs/dialog-shuffle.c @@ -41,7 +41,7 @@ #include #include -#include "data-shuffling.h" +#include #define SHUFFLE_KEY "shuffle-dialog" diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c index 1ddaeed4a..0394eb16e 100644 --- a/src/dialogs/dialog-simulation.c +++ b/src/dialogs/dialog-simulation.c @@ -35,7 +35,7 @@ #include #include -#include "simulation.h" +#include "tools/simulation.h" #include #include diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c index 7c0677c77..c9394a1ce 100644 --- a/src/dialogs/dialog-solver.c +++ b/src/dialogs/dialog-solver.c @@ -50,7 +50,7 @@ #include #include #include -#include +#include #define SOLVER_KEY "solver-dialog" diff --git a/src/sheet.c b/src/sheet.c index a947b62ae..a3bc82110 100644 --- a/src/sheet.c +++ b/src/sheet.c @@ -61,7 +61,7 @@ #include "sheet-filter.h" #include "sheet-filter-combo.h" #include "gnm-sheet-slicer.h" -#include "scenarios.h" +#include "tools/scenarios.h" #include "cell-draw.h" #include "sort.h" #include "gutils.h" diff --git a/src/tools/analysis-anova.h b/src/tools/analysis-anova.h index 81279af81..d23d78d6a 100644 --- a/src/tools/analysis-anova.h +++ b/src/tools/analysis-anova.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" diff --git a/src/tools/analysis-auto-expression.h b/src/tools/analysis-auto-expression.h index 3217f3f69..07bc8e250 100644 --- a/src/tools/analysis-auto-expression.h +++ b/src/tools/analysis-auto-expression.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "sheet.h" diff --git a/src/tools/analysis-chi-squared.h b/src/tools/analysis-chi-squared.h index 6cba0145b..7a81e5604 100644 --- a/src/tools/analysis-chi-squared.h +++ b/src/tools/analysis-chi-squared.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "sheet.h" diff --git a/src/tools/analysis-exp-smoothing.h b/src/tools/analysis-exp-smoothing.h index 33dc9435d..69b094605 100644 --- a/src/tools/analysis-exp-smoothing.h +++ b/src/tools/analysis-exp-smoothing.h @@ -30,7 +30,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" diff --git a/src/tools/analysis-frequency.h b/src/tools/analysis-frequency.h index 80f0e270a..63103b2ca 100644 --- a/src/tools/analysis-frequency.h +++ b/src/tools/analysis-frequency.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" diff --git a/src/tools/analysis-histogram.h b/src/tools/analysis-histogram.h index bc86c3147..105ab4533 100644 --- a/src/tools/analysis-histogram.h +++ b/src/tools/analysis-histogram.h @@ -30,7 +30,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" diff --git a/src/tools/analysis-kaplan-meier.h b/src/tools/analysis-kaplan-meier.h index 1d9975f78..adb05c018 100644 --- a/src/tools/analysis-kaplan-meier.h +++ b/src/tools/analysis-kaplan-meier.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" diff --git a/src/tools/analysis-normality.h b/src/tools/analysis-normality.h index 5cf03cf4d..e2c9b56f6 100644 --- a/src/tools/analysis-normality.h +++ b/src/tools/analysis-normality.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" diff --git a/src/tools/analysis-one-mean-test.h b/src/tools/analysis-one-mean-test.h index 0761e4d29..781fdea1b 100644 --- a/src/tools/analysis-one-mean-test.h +++ b/src/tools/analysis-one-mean-test.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "sheet.h" diff --git a/src/tools/analysis-principal-components.h b/src/tools/analysis-principal-components.h index 25268c6c3..4ec38cfef 100644 --- a/src/tools/analysis-principal-components.h +++ b/src/tools/analysis-principal-components.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "sheet.h" diff --git a/src/tools/analysis-sign-test.h b/src/tools/analysis-sign-test.h index 135a8f174..0d46c73ff 100644 --- a/src/tools/analysis-sign-test.h +++ b/src/tools/analysis-sign-test.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "sheet.h" diff --git a/src/tools/analysis-signed-rank-test.h b/src/tools/analysis-signed-rank-test.h index 04283af8a..be738abd6 100644 --- a/src/tools/analysis-signed-rank-test.h +++ b/src/tools/analysis-signed-rank-test.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "analysis-sign-test.h" diff --git a/src/tools/analysis-tools.h b/src/tools/analysis-tools.h index 6aeef6f61..0036f70c3 100644 --- a/src/tools/analysis-tools.h +++ b/src/tools/analysis-tools.h @@ -4,7 +4,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "regression.h" #include "func.h" diff --git a/src/tools/analysis-wilcoxon-mann-whitney.h b/src/tools/analysis-wilcoxon-mann-whitney.h index 604309674..3e1c9ca2f 100644 --- a/src/tools/analysis-wilcoxon-mann-whitney.h +++ b/src/tools/analysis-wilcoxon-mann-whitney.h @@ -28,7 +28,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" #include "analysis-tools.h" #include "sheet.h" diff --git a/src/tools/dao.c b/src/tools/dao.c index 3db7363f2..ffcd9fbd8 100644 --- a/src/tools/dao.c +++ b/src/tools/dao.c @@ -25,7 +25,7 @@ */ #include -#include "dao.h" +#include #include "expr.h" #include "value.h" diff --git a/src/tools/data-shuffling.c b/src/tools/data-shuffling.c index 476c26160..924a81ba5 100644 --- a/src/tools/data-shuffling.c +++ b/src/tools/data-shuffling.c @@ -35,8 +35,7 @@ #include #include "gnm-random.h" -#include "data-shuffling.h" -#include "dao.h" +#include "tools/data-shuffling.h" #include "expr.h" diff --git a/src/tools/data-shuffling.h b/src/tools/data-shuffling.h index c3c966a4c..37c47df2c 100644 --- a/src/tools/data-shuffling.h +++ b/src/tools/data-shuffling.h @@ -2,7 +2,7 @@ #define __DATA_SHUFFLING_H__ #include -#include +#include #define SHUFFLE_COLS 0 diff --git a/src/tools/fill-series.c b/src/tools/fill-series.c index 6281748d8..f0b83a0cc 100644 --- a/src/tools/fill-series.c +++ b/src/tools/fill-series.c @@ -39,8 +39,7 @@ #include "gnm-datetime.h" #include "mathfunc.h" -#include "fill-series.h" -#include "dao.h" +#include "tools/fill-series.h" #include static void diff --git a/src/tools/fill-series.h b/src/tools/fill-series.h index 51a1bf4bc..98afacaed 100644 --- a/src/tools/fill-series.h +++ b/src/tools/fill-series.h @@ -2,7 +2,7 @@ #define __FILL_SERIES_H__ #include -#include +#include typedef enum { diff --git a/src/tools/filter.h b/src/tools/filter.h index 41c16e39a..29eaf6079 100644 --- a/src/tools/filter.h +++ b/src/tools/filter.h @@ -2,7 +2,7 @@ #define __FILTER_H__ #include -#include +#include gint advanced_filter (WorkbookControl *wbc, data_analysis_output_t *dao, diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c index c144672fb..6e3e9c3ed 100644 --- a/src/tools/gnm-solver.c +++ b/src/tools/gnm-solver.c @@ -15,7 +15,7 @@ #include "workbook-control.h" #include "application.h" #include "gnm-marshalers.h" -#include "dao.h" +#include #include "gui-util.h" #include "gnm-i18n.h" #include diff --git a/src/tools/random-generator-cor.c b/src/tools/random-generator-cor.c index f23ea87be..4cffcb50f 100644 --- a/src/tools/random-generator-cor.c +++ b/src/tools/random-generator-cor.c @@ -30,8 +30,8 @@ #include "value.h" #include "ranges.h" #include "expr.h" -#include "dao.h" -#include "dao.h" +#include +#include #include "sheet.h" #include "func.h" #include "numbers.h" diff --git a/src/tools/random-generator-cor.h b/src/tools/random-generator-cor.h index 38dff9afe..a909c9bd1 100644 --- a/src/tools/random-generator-cor.h +++ b/src/tools/random-generator-cor.h @@ -3,7 +3,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" typedef enum { diff --git a/src/tools/random-generator.h b/src/tools/random-generator.h index ca9170cb5..0d37b4a13 100644 --- a/src/tools/random-generator.h +++ b/src/tools/random-generator.h @@ -3,7 +3,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" diff --git a/src/tools/scenarios.c b/src/tools/scenarios.c index 175d8b263..ea43bbc55 100644 --- a/src/tools/scenarios.c +++ b/src/tools/scenarios.c @@ -32,7 +32,7 @@ #include #include "scenarios.h" -#include "dao.h" +#include #include "clipboard.h" #include "parse-util.h" #include diff --git a/src/tools/simulation.h b/src/tools/simulation.h index 7fe0e3745..0df9daeaf 100644 --- a/src/tools/simulation.h +++ b/src/tools/simulation.h @@ -3,7 +3,7 @@ #ifndef __SIMULATION_H__ #define __SIMULATION_H__ -#include "dao.h" +#include typedef enum { MedianErr = 1, ModeErr = 2, StddevErr = 4, VarErr = 8, SkewErr = 16, diff --git a/src/tools/tabulate.h b/src/tools/tabulate.h index b6238cc5c..8a6405422 100644 --- a/src/tools/tabulate.h +++ b/src/tools/tabulate.h @@ -3,7 +3,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include #include "tools.h" typedef struct { diff --git a/src/tools/tools.h b/src/tools/tools.h index 5e75b6667..370ede792 100644 --- a/src/tools/tools.h +++ b/src/tools/tools.h @@ -17,7 +17,7 @@ #include "gnumeric.h" #include "numbers.h" -#include "dao.h" +#include typedef enum { TOOL_ENGINE_UPDATE_DAO = 0, -- 2.11.4.GIT