From 7d7fea7f75524611238ce1b3546b95646cdcf359 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 17 Oct 2019 15:20:31 +0200 Subject: make bin/update_pch.s always include code in trivial #if's MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit E.g. #ifdef LIBO_INTERNAL_ONLY is always true for code that builds with our PCHs. Change-Id: I3cf311ea3621b909105754cfea2cb0116b8b67f5 Reviewed-on: https://gerrit.libreoffice.org/80961 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- .../inc/pch/precompiled_PresentationMinimizer.hxx | 54 +++------------------- sdext/inc/pch/precompiled_PresenterScreen.hxx | 6 ++- 2 files changed, 11 insertions(+), 49 deletions(-) (limited to 'sdext') diff --git a/sdext/inc/pch/precompiled_PresentationMinimizer.hxx b/sdext/inc/pch/precompiled_PresentationMinimizer.hxx index e2fb9539e135..6bdf5c6334da 100644 --- a/sdext/inc/pch/precompiled_PresentationMinimizer.hxx +++ b/sdext/inc/pch/precompiled_PresentationMinimizer.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-04-29 21:18:57 using: + Generated on 2019-10-17 15:16:09 using: ./bin/update_pch sdext PresentationMinimizer --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -38,14 +38,13 @@ #include #include #include -#include #include #include +#include #include #include #include #include -#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -65,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -80,68 +80,32 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include #include #include #include -#include -#include #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include -#include -#include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include #include #include -#include #include -#include -#include -#include +#include #include -#include +#include #include #include -#include -#include -#include #include #include #include @@ -151,7 +115,6 @@ #include #include #include -#include #include #include #include @@ -192,6 +155,7 @@ #include #include #include +#include #include #include #include @@ -205,21 +169,15 @@ #include #include #include -#include -#include -#include #include #include #include -#include #include #include #include #include #include #include -#include -#include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #endif // PCH_LEVEL >= 4 diff --git a/sdext/inc/pch/precompiled_PresenterScreen.hxx b/sdext/inc/pch/precompiled_PresenterScreen.hxx index 6d22aa8bb095..773cd502827f 100644 --- a/sdext/inc/pch/precompiled_PresenterScreen.hxx +++ b/sdext/inc/pch/precompiled_PresenterScreen.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-04-29 21:18:57 using: + Generated on 2019-10-17 15:16:10 using: ./bin/update_pch sdext PresenterScreen --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -35,6 +35,9 @@ #include #include #include +#include +#include +#include #include #include #endif // PCH_LEVEL >= 1 @@ -54,6 +57,7 @@ #include #include #include +#include #include #include #include -- cgit