configure.ac | 2 +- reportdesign/inc/RptDef.hxx | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit 6e7d4c1185a9a70ea795b6959fbd87ac8e84480c Author: Henry Castro <hcas...@collabora.com> AuthorDate: Fri Nov 6 07:50:27 2020 -0400 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Mon Nov 9 12:03:33 2020 +0100 lok:configure: replace obsolete configuration links The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS" Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105423 Tested-by: Jenkins Reviewed-by: Henry Castro <hcas...@collabora.com> diff --git a/configure.ac b/configure.ac index cd7af465d660..34d116db105e 100644 --- a/configure.ac +++ b/configure.ac @@ -14057,7 +14057,7 @@ CFLAGS=$my_original_CFLAGS CXXFLAGS=$my_original_CXXFLAGS CPPFLAGS=$my_original_CPPFLAGS -AC_LINK_FILES([include], [include]) +AC_CONFIG_LINKS([include:include]) # Keep in sync with list of files far up, at AC_MSG_CHECKING([for # BUILD platform configuration] - otherwise breaks cross building commit 9a2d8d30ac2e525963c764794bd3d6bd3462f64b Author: shubham656 <shubham656j...@gmail.com> AuthorDate: Sat Nov 7 17:47:18 2020 +0530 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Mon Nov 9 12:03:24 2020 +0100 tdf#124176 Use pragma once instead of inclusive guards Change-Id: I1eafb1e903d44f52eac8a506e6123c0978f00394 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105431 Reviewed-by: Michael Stahl <michael.st...@cib.de> Tested-by: Jenkins diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index f2dd5952684a..91fff4ae2342 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX -#define INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX +#pragma once #include <memory> #include <map> @@ -88,6 +87,4 @@ template < typename T> T getStyleProperty(const css::uno::Reference< css::report } -#endif // INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits