[Libreoffice-commits] core.git: basic/source config_host/config_extensions.h.in config_host/config_extension_update.h.in config_host/config_features.h.in configure.ac desktop/source
Rene Engelhard
rene at debian.org
Wed May 23 09:45:22 UTC 2018
basic/source/uno/namecont.cxx | 2 -
config_host/config_extension_update.h.in | 6 ----
config_host/config_extensions.h.in | 15 ++++++++++
config_host/config_features.h.in | 9 ------
configure.ac | 2 -
desktop/source/app/app.cxx | 1
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 -
desktop/source/deployment/manager/dp_activepackages.hxx | 2 -
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 2 -
9 files changed, 21 insertions(+), 20 deletions(-)
New commits:
commit 51e92859c9433feeca0ccca9238e9ed0848d8470
Author: Rene Engelhard <rene at debian.org>
Date: Wed May 9 23:25:46 2018 +0000
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 at libreoffice.org>
Reviewed-by: Rene Engelhard <rene at debian.org>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index becadd064099..8ad36224f819 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
+#include <config_extensions.h>
#include <config_folders.h>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/config_host/config_extension_update.h.in b/config_host/config_extension_update.h.in
deleted file mode 100644
index 5e12a78f951e..000000000000
--- a/config_host/config_extension_update.h.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_EXTENSION_UPDATE
-#define CONFIG_EXTENSION_UPDATE
-
-#define ENABLE_EXTENSION_UPDATE 0
-
-#endif
diff --git a/config_host/config_extensions.h.in b/config_host/config_extensions.h.in
new file mode 100644
index 000000000000..62cf1862896a
--- /dev/null
+++ b/config_host/config_extensions.h.in
@@ -0,0 +1,15 @@
+#ifndef CONFIG_EXTENSION_UPDATE
+#define CONFIG_EXTENSION_UPDATE
+
+/* EXTENSIONS - Whether we have any extension mechanism at all
+ *
+ * Primarily intended for non-desktop platforms where supporting
+ * extensions can be complicated, or even prohibited by the OS (as on
+ * iOS).
+ */
+
+#define HAVE_FEATURE_EXTENSIONS 0
+
+#define ENABLE_EXTENSION_UPDATE 0
+
+#endif
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index c66435a12007..a7b08c7ddcfe 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -47,15 +47,6 @@
#define HAVE_FEATURE_DBCONNECTIVITY 0
-/* EXTENSIONS - Whether we have any extension mechanism at all
- *
- * Primarily intended for non-desktop platforms where supporting
- * extensions can be complicated, or even prohibited by the OS (as on
- * iOS).
- */
-
-#define HAVE_FEATURE_EXTENSIONS 0
-
/* SCRIPTING - Whether we have any mechanism to execute user-provided scripts
*
* Primarily intended for the iOS App Store where the
diff --git a/configure.ac b/configure.ac
index 69be2fce47ec..95e2865017a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12725,7 +12725,7 @@ AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_dconf.h])
AC_CONFIG_HEADERS([config_host/config_eot.h])
-AC_CONFIG_HEADERS([config_host/config_extension_update.h])
+AC_CONFIG_HEADERS([config_host/config_extensions.h])
AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h])
AC_CONFIG_HEADERS([config_host/config_cxxabi.h])
AC_CONFIG_HEADERS([config_host/config_dbus.h])
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
More information about the Libreoffice-commits
mailing list