diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-07 13:46:52 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-09 06:51:51 +0100 |
commit | 083900f88c112b69e098bbe5820b1d077c18e92c (patch) | |
tree | c1f54839b3feb3d5bf0af4139b51bafee81560ed /desktop | |
parent | 1c3e170d56d3cad1e7729f839fa63f607b62e4e3 (diff) |
Make sal/config.h the first in pch
By convention, it should be the first include in C/CXX files;
so use of pch should not break that.
Change-Id: Ic329c5f39e8f48ad1778724368e262e48972342b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112123
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/inc/pch/precompiled_deployment.hxx | 4 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_deploymentgui.hxx | 4 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_deploymentmisc.hxx | 5 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_sofficeapp.hxx | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx index 11bca0e5d0a9..f4e8cf931cef 100644 --- a/desktop/inc/pch/precompiled_deployment.hxx +++ b/desktop/inc/pch/precompiled_deployment.hxx @@ -13,13 +13,14 @@ 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 2020-12-15 11:15:31 using: + Generated on 2021-03-08 13:13:30 using: ./bin/update_pch desktop deployment --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./desktop/inc/pch/precompiled_deployment.hxx "make desktop.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <cstddef> @@ -42,7 +43,6 @@ #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#include <sal/config.h> #include <sal/log.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx index 6207bfca69e4..fe7d402e7e36 100644 --- a/desktop/inc/pch/precompiled_deploymentgui.hxx +++ b/desktop/inc/pch/precompiled_deploymentgui.hxx @@ -13,13 +13,14 @@ 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 2021-02-05 16:09:53 using: + Generated on 2021-03-08 13:13:39 using: ./bin/update_pch desktop deploymentgui --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./desktop/inc/pch/precompiled_deploymentgui.hxx "make desktop.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <cassert> @@ -51,7 +52,6 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index 2c6f14d15bc3..c2781e2cd878 100644 --- a/desktop/inc/pch/precompiled_deploymentmisc.hxx +++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx @@ -13,13 +13,14 @@ 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 2021-03-06 20:41:37 using: + Generated on 2021-03-08 13:13:41 using: ./bin/update_pch desktop deploymentmisc --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./desktop/inc/pch/precompiled_deploymentmisc.hxx "make desktop.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <cassert> #include <cstddef> @@ -34,6 +35,7 @@ #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> +#include <osl/file.h> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/pipe.hxx> @@ -50,7 +52,6 @@ #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/saldllapi.h> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 2d4f3822b7de..9430c5309057 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -13,13 +13,14 @@ 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 2021-03-06 18:49:24 using: + Generated on 2021-03-08 13:13:35 using: ./bin/update_pch desktop sofficeapp --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./desktop/inc/pch/precompiled_sofficeapp.hxx "make desktop.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <cassert> @@ -54,6 +55,7 @@ #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> +#include <osl/file.h> #include <osl/file.hxx> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> @@ -71,6 +73,7 @@ #include <rtl/character.hxx> #include <rtl/digest.h> #include <rtl/instance.hxx> +#include <rtl/locale.h> #include <rtl/math.h> #include <rtl/process.h> #include <rtl/ref.hxx> @@ -86,7 +89,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> |