diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-22 18:19:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-22 18:19:55 +0100 |
| commit | 1f393e01ca9ed878e6abc2cfa2bc8cf8e64f2ef3 (patch) | |
| tree | 1ff0abc7d0012df049bd73eaf2f74b906ceb3d95 | |
| parent | 9c281fda84bea4407bb8265d1e125fc6e429064d (diff) | |
For convenience, include config_global.h in sal/config.h
...which must be included first thing everywhere anyway.
Change-Id: Idbbf941b526f48a89d6398e19404b1ff0e23a6b4
| -rw-r--r-- | sal/inc/rtl/allocator.hxx | 6 | ||||
| -rw-r--r-- | sal/inc/rtl/instance.hxx | 4 | ||||
| -rw-r--r-- | sal/inc/rtl/stringutils.hxx | 4 | ||||
| -rw-r--r-- | sal/inc/sal/config.h | 4 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 4 |
5 files changed, 7 insertions, 15 deletions
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx index 2cbf95bc47c0..05575c247fe9 100644 --- a/sal/inc/rtl/allocator.hxx +++ b/sal/inc/rtl/allocator.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_RTL_ALLOCATOR_HXX #define INCLUDED_RTL_ALLOCATOR_HXX +#include "sal/config.h" + #include "sal/types.h" #include "rtl/alloc.h" #include <cstddef> -#if defined LIBO_INTERNAL_ONLY -#include "config_global.h" -#endif - /// @cond INTERNAL //###################################################### diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx index 912a3d4597f0..1efda808abec 100644 --- a/sal/inc/rtl/instance.hxx +++ b/sal/inc/rtl/instance.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_RTL_INSTANCE_HXX #define INCLUDED_RTL_INSTANCE_HXX -#if defined LIBO_INTERNAL_ONLY -#include <config_global.h> -#endif +#include "sal/config.h" #include "osl/doublecheckedlocking.h" #include "osl/getglobalmutex.hxx" diff --git a/sal/inc/rtl/stringutils.hxx b/sal/inc/rtl/stringutils.hxx index 765319def700..7ca2281a8230 100644 --- a/sal/inc/rtl/stringutils.hxx +++ b/sal/inc/rtl/stringutils.hxx @@ -31,10 +31,6 @@ #include "sal/config.h" -#if defined LIBO_INTERNAL_ONLY -#include <config_global.h> -#endif - // Manually defining RTL_DISABLE_FAST_STRING allows to force turning fast string concatenation off // (e.g. for debugging). #ifndef RTL_DISABLE_FAST_STRING diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index 03e24c6c6394..e990e35ca770 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -20,6 +20,10 @@ #ifndef _SAL_CONFIG_H_ #define _SAL_CONFIG_H_ +#if defined LIBO_INTERNAL_ONLY +#include "config_global.h" +#endif + #ifndef INCLUDED_STDLIB_H #include <stdlib.h> #define INCLUDED_STDLIB_H diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index b89b0569852f..346abf6691d0 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -23,10 +23,6 @@ #include <sal/config.h> #include <sal/macros.h> -#if defined LIBO_INTERNAL_ONLY -#include <config_global.h> -#endif - #include <sal/typesizes.h> #ifdef __cplusplus |