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 --- xmloff/inc/pch/precompiled_xo.hxx | 22 ++++++++-------------- xmloff/inc/pch/precompiled_xof.hxx | 6 +----- 2 files changed, 9 insertions(+), 19 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 43675ab4d00e..bfde4cd6ae63 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.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-05-12 16:58:05 using: + Generated on 2019-10-17 15:17:55 using: ./bin/update_pch xmloff xo --cutoff=7 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +44,6 @@ #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include -#include #include #include #include @@ -73,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -81,15 +83,14 @@ #include #include #include -#include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include #include #include #include +#include #include -#include #include #include #include @@ -98,9 +99,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -109,7 +108,6 @@ #include #include #include -#include #include #include #include @@ -117,13 +115,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -143,6 +141,7 @@ #include #include #include +#include #include #include #include @@ -162,7 +161,6 @@ #include #include #include -#include #include #include #include @@ -179,7 +177,6 @@ #include #include #include -#include #include #include #include @@ -194,11 +191,9 @@ #include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include #include #include #include -#include #include #include #include @@ -216,12 +211,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -230,6 +223,7 @@ #include #include #include +#include #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/pch/precompiled_xof.hxx b/xmloff/inc/pch/precompiled_xof.hxx index 8105fe84d3c4..91bcdda240d9 100644 --- a/xmloff/inc/pch/precompiled_xof.hxx +++ b/xmloff/inc/pch/precompiled_xof.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:19:20 using: + Generated on 2019-10-17 15:17:56 using: ./bin/update_pch xmloff xof --cutoff=1 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -28,7 +28,6 @@ #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include -#include #include #include #include @@ -40,14 +39,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -59,7 +56,6 @@ #include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include #include #include #include -- cgit