diff options
| -rw-r--r-- | include/o3tl/strong_int.hxx | 2 | ||||
| -rw-r--r-- | include/osl/interlck.h | 4 | ||||
| -rw-r--r-- | include/sal/config.h | 5 | ||||
| -rw-r--r-- | include/sal/types.h | 4 | ||||
| -rw-r--r-- | include/svl/itemset.hxx | 1 | ||||
| -rw-r--r-- | sal/osl/all/log.cxx | 1 | ||||
| -rw-r--r-- | sal/osl/unx/interlck.cxx | 1 | ||||
| -rw-r--r-- | sal/osl/unx/salinit.cxx | 1 | ||||
| -rw-r--r-- | sal/rtl/math.cxx | 1 |
9 files changed, 16 insertions, 4 deletions
diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx index 2c9177b405e0..c0378e344c69 100644 --- a/include/o3tl/strong_int.hxx +++ b/include/o3tl/strong_int.hxx @@ -25,6 +25,8 @@ #include <cassert> #include <type_traits> +#include <config_global.h> + namespace o3tl { diff --git a/include/osl/interlck.h b/include/osl/interlck.h index a98c08cb511c..c0e06fd6f659 100644 --- a/include/osl/interlck.h +++ b/include/osl/interlck.h @@ -29,6 +29,10 @@ #include <intrin.h> #endif +#if defined LIBO_INTERNAL_ONLY +#include "config_global.h" +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/sal/config.h b/include/sal/config.h index 7fcdbfab45ad..03a2f5b9fa21 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -20,12 +20,9 @@ #ifndef INCLUDED_SAL_CONFIG_H #define INCLUDED_SAL_CONFIG_H -#if defined LIBO_INTERNAL_ONLY -#include "config_global.h" -#if defined ANDROID && defined __cplusplus +#if defined LIBO_INTERNAL_ONLY && defined ANDROID && defined __cplusplus #include <android/compatibility.hxx> #endif -#endif #include <stdlib.h> diff --git a/include/sal/types.h b/include/sal/types.h index 5f6331709af3..8678562ccc76 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -27,6 +27,10 @@ #include "sal/macros.h" #include "sal/typesizes.h" +#if defined LIBO_INTERNAL_ONLY +#include "config_global.h" +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index d5a2b5eb5ad7..c8e32863ba84 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -27,6 +27,7 @@ #include <type_traits> #include <memory> +#include <config_global.h> #include <svl/svldllapi.h> #include <svl/poolitem.hxx> #include <svl/typedwhich.hxx> diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 66722662af80..83ff23e42add 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -21,6 +21,7 @@ #include <string.h> #include <fstream> +#include <config_global.h> #include <osl/thread.hxx> #include <rtl/string.h> #include <sal/detail/log.h> diff --git a/sal/osl/unx/interlck.cxx b/sal/osl/unx/interlck.cxx index e114485877db..81404cb57a7a 100644 --- a/sal/osl/unx/interlck.cxx +++ b/sal/osl/unx/interlck.cxx @@ -19,6 +19,7 @@ #include "system.hxx" +#include <config_global.h> #include <osl/interlck.h> #if ( defined (__sun) || defined ( NETBSD ) ) && defined ( SPARC ) diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index cfc612b8b77c..5e95c2bab532 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -28,6 +28,7 @@ #include <sys/stat.h> #endif +#include <config_global.h> #include <osl/process.h> #include <sal/main.h> #include <sal/types.h> diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 387ae3b2b4aa..9f25d653f3f1 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -19,6 +19,7 @@ #include <rtl/math.h> +#include <config_global.h> #include <o3tl/safeint.hxx> #include <osl/diagnose.h> #include <rtl/alloc.h> |