diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-18 20:06:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-19 09:35:22 +0100 |
| commit | 64c9bda0b9d43a4b4cc1d40068f0d0fb261fb5b4 (patch) | |
| tree | 431dbab24b3b8b884feee9a61151fab30d92620b /include/sal | |
| parent | 9bca3cc18655d02f3c111d692b26339a6e3669d4 (diff) | |
Remove include of config_global.h from sal/config.h
(where it is not actually needed), and instead include it where needed
Change-Id: I107f8d4002d3001393b89834dd30a30b0c53a792
Reviewed-on: https://gerrit.libreoffice.org/48152
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/sal')
| -rw-r--r-- | include/sal/config.h | 5 | ||||
| -rw-r--r-- | include/sal/types.h | 4 |
2 files changed, 5 insertions, 4 deletions
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 |