[Libreoffice-commits] core.git: sal/inc

[Stephan Bergmann]

 sal/inc/rtl/allocator.hxx   |    6 ++----
 sal/inc/rtl/instance.hxx    |    4 +---
 sal/inc/rtl/stringutils.hxx |    4 ----
 sal/inc/sal/config.h        |    4 ++++
 sal/inc/sal/types.h         |    4 ----
 5 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 1f393e01ca9ed878e6abc2cfa2bc8cf8e64f2ef3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 22 18:19:55 2013 +0100

    For convenience, include config_global.h in sal/config.h
    
    ...which must be included first thing everywhere anyway.
    
    Change-Id: Idbbf941b526f48a89d6398e19404b1ff0e23a6b4

diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 2cbf95b..05575c2 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 912a3d4..1efda80 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 765319d..7ca2281 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 03e24c6..e990e35 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 b89b056..346abf6 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