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 --- sw/inc/pch/precompiled_msword.hxx | 5 ++++- sw/inc/pch/precompiled_sw.hxx | 6 +++++- sw/inc/pch/precompiled_swui.hxx | 15 ++++++--------- sw/inc/pch/precompiled_vbaswobj.hxx | 25 ++++++++++++++----------- 4 files changed, 29 insertions(+), 22 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index add6e63862b6..c40301871c1b 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.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-10-02 19:37:40 using: + Generated on 2019-10-17 15:16:54 using: ./bin/update_pch sw msword --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -45,6 +45,8 @@ #include #include #include +#include +#include #include #include #include @@ -80,6 +82,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index c7126c860eef..7b2191718dfc 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.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-10-05 20:14:03 using: + Generated on 2019-10-17 15:17:13 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +68,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 464997c48a58..3db3571ed8b2 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.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-09-25 10:57:13 using: + Generated on 2019-10-17 15:17:23 using: ./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -45,11 +46,14 @@ #include #include #include +#include +#include #include #include #include #include #include +#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -69,6 +73,7 @@ #include #include #include +#include #include #include #include @@ -93,8 +98,6 @@ #include #include #include -#include -#include #include #include #include @@ -133,13 +136,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -153,9 +154,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -416,7 +414,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index ae983c8ed302..7b6b4f96bf4e 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.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:16:21 using: + Generated on 2019-10-17 15:17:29 using: ./bin/update_pch sw vbaswobj --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -47,6 +48,8 @@ #include #include #include +#include +#include #include #include #include @@ -58,8 +61,8 @@ #include #include #include -#include #include +#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -83,6 +86,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +95,7 @@ #include #include #include +#include #include #include #include @@ -100,8 +105,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -138,7 +143,6 @@ #include #include #include -#include #include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 @@ -160,11 +164,10 @@ #include #include #include -#include -#include #include #include #include +#include #include #include #include @@ -173,8 +176,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -192,6 +197,7 @@ #include #include #include +#include #include #include #include @@ -200,6 +206,7 @@ #include #include #include +#include #include #include #include @@ -214,11 +221,10 @@ #include #include #include -#include -#include #include #include #include +#include #include #include #include @@ -261,7 +267,6 @@ #include #include #include -#include #include #include #include @@ -272,10 +277,8 @@ #include #include #include -#include #include #include -#include #include #include #include -- cgit