desktop/source/app/updater.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit ea5e3865b4d47c796a36852c5d5e5a7b736a21cf
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Oct 2 15:42:34 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Oct 2 17:35:48 2024 +0200
Hack reordering includes to avoid Windows Yield macro fallout
No idea why my local Windows build started to only now fail with
> [build CXX] desktop/source/app/updater.cxx
> C:\lo > C:\lo
or how to potentially address that properly with prewin.h/postwin.h...
Change-Id: I8afbc0c485505ee8ab2cb956c58835bb6a73cab8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174390
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Jenkins
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 39810c2cbbdc..39699b90dec5 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+// Include this early, as it uses the identifier "Yield" which is defined as a
macro in Windows
+// system files indirectly included via some of the later includes here:
+#include <vcl/svapp.hxx>
+
#include "updater.hxx"
#if UNX
@@ -48,8 +52,6 @@
#include <officecfg/Setup.hxx>
-#include <vcl/svapp.hxx>
-
#include <functional>
#include <memory>
#include <set>
