Rebased ref, commits from common ancestor:
commit 93deffd259fe36d2d80904675bd9c176cc1d7b4f
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Nov 25 17:33:12 2019 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Nov 27 08:59:34 2019 +0100
Release 5.4.9.0
diff --git a/configure.ac b/configure.ac
index f3450a5eed75..92264315cc2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.8.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.9.0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 52ae0e0b55dbbcc902b4656e58f9b0d888caab75
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Aug 31 02:23:38 2019 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Nov 27 08:59:34 2019 +0100
Fix MSVC2019 build after 629dfff3c7289f185268c7088e67931f6bbd9ce0
... failing like this:
[CXX] desktop/source/app/sofficemain.cxx
C:\PROGRA~2\WI3CF2~1\10\Include\10.0.18362.0\um\winnt.h(656): error
C4005: 'DECLARE_HANDLE': macro redefinition
C:\lo\src\core\include\sal/main.h(91): note: see previous definition of
'DECLARE_HANDLE'
C:\PROGRA~2\WI3CF2~1\10\Include\10.0.18362.0\shared\minwindef.h(250):
error C2371: 'HINSTANCE': redefinition; different basic types
C:\lo\src\core\include\sal/main.h(93): note: see declaration of
'HINSTANCE'
make[1]: *** [C:/lo/src/core/solenv/gbuild/LinkTarget.mk:293:
C:/lo/src/core/workdir/CxxObject/desktop/source/app/sofficemain.o] Error 2
Apparently MSVC2017 isn't affected, since the problematic commit passed
CI happliy (didn't test myself if MSVC version is actually the problem,
or maybe specific Windows SDK version).
Change-Id: Ibcaa3a8d09bae54e436366623fe103e8c5f58f40
Reviewed-on: https://gerrit.libreoffice.org/78334
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 4e527f55d74e3220873075a8ec2799e2206fdb2d)
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index 27b9efa600db..901fe961a141 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -28,6 +28,9 @@
#include "cmdlineargs.hxx"
#include "cmdlinehelp.hxx"
+// needed before sal/main.h to avoid redefinition of macros
+#include <prewin.h>
+
#include <desktop/exithelper.h>
#include <osl/file.hxx>
#include <rtl/bootstrap.hxx>
@@ -64,6 +67,7 @@
#endif
+#include <postwin.h>
#ifdef ANDROID
# include <jni.h>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
