diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-10-02 15:42:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-10-02 17:35:48 +0200 |
| commit | ea5e3865b4d47c796a36852c5d5e5a7b736a21cf (patch) | |
| tree | 23073b0b39329d5ee0a44951d760e4e0c28d58ee /desktop/source | |
| parent | 064937d0b5f6786e3ec347fdc5b2c771de348ffa (diff) | |
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\core\include\vcl/svapp.hxx(491): error C2208: 'void': no members defined using this type
> C:\lo\core\include\vcl/svapp.hxx(491): warning C4091: 'static ': ignored on left of 'void' when no variable is declared
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.bergmann@allotropia.de>
Tested-by: Jenkins
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/updater.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
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> |