diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-04-08 13:50:57 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-04-08 17:22:41 +0200 |
| commit | b8901e8beac21087c69cc5c343850eff809ab3a7 (patch) | |
| tree | e3427d11afb1e755e6eec9b227b74f288c0c6532 | |
| parent | 15a0bdd32df89aa8d2e5ab49e07061f0708651e6 (diff) | |
allow more trivial #if's for including headers in PCHs
Change-Id: I734ac1832bafe0f4e5710b9b27bd03833179e2d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113800
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rwxr-xr-x | bin/update_pch | 6 | ||||
| -rw-r--r-- | include/osl/time.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/bin/update_pch b/bin/update_pch index 974d53ab9197..e47a97994bb2 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -690,6 +690,12 @@ def is_allowed_if(line, module): # Our sources always build with LIBO_INTERNAL_ONLY. if line == "#if defined LIBO_INTERNAL_ONLY" or line == "#ifdef LIBO_INTERNAL_ONLY": return True + # We use PCHs only for C++. + if line == "#if defined(__cplusplus)" or line == "#if defined __cplusplus": + return True + # Debug-specific code, it shouldn't hurt including it unconditionally. + if line == "#ifdef DBG_UTIL" or line == "#if OSL_DEBUG_LEVEL > 0": + return True if module == "external/skia": # We always set these. if line == "#ifdef SK_VULKAN" or line == "#if SK_SUPPORT_GPU": diff --git a/include/osl/time.h b/include/osl/time.h index 43661d4ac421..5c5096cada8a 100644 --- a/include/osl/time.h +++ b/include/osl/time.h @@ -26,9 +26,11 @@ #include "sal/config.h" -#if defined LIBO_INTERNAL_ONLY && defined __cplusplus +#if defined LIBO_INTERNAL_ONLY +#if defined __cplusplus #include <chrono> #endif +#endif #include "sal/saldllapi.h" #include "sal/types.h" |