diff options
| author | Rene Engelhard <rene@debian.org> | 2018-05-09 23:25:46 +0000 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2018-05-23 11:44:57 +0200 |
| commit | 51e92859c9433feeca0ccca9238e9ed0848d8470 (patch) | |
| tree | 00f63a009c2c41097bdbf5112103132bbe699353 /desktop | |
| parent | 5c2c5ff01c23e4f7a8947746afc13a46cbef5bec (diff) | |
rename config_extension_update.h.in to config_extensions.h.in
... and move HAVE_FEATURE_EXTENSIONS there, too
Change-Id: I37fe52071e1db32cf5cc1e51dbd89bb4f32a39c1
Reviewed-on: https://gerrit.libreoffice.org/54072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'desktop')
4 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 22092bac9760..cb67abaa8fd9 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -21,6 +21,7 @@ #include <config_features.h> #include <config_java.h> #include <config_folders.h> +#include <config_extensions.h> #include <sal/config.h> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index ed00106535e8..293f83539ccf 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX -#include <config_extension_update.h> +#include <config_extensions.h> #include <vcl/dialog.hxx> #include <vcl/button.hxx> diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 286f9d801372..9d7b7b5ecf41 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_ACTIVEPACKAGES_HXX -#include <config_features.h> +#include <config_extensions.h> #include <sal/config.h> diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 4b1c943f0cac..dc83fe547ba7 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -20,7 +20,7 @@ //TODO: Large parts of this file were copied from dp_component.cxx; those parts // should be consolidated. -#include <config_features.h> +#include <config_extensions.h> #include <dp_backend.h> #if HAVE_FEATURE_EXTENSIONS |