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/48152Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

include/o3tl/strong_int.hxx

@@ -25,6 +25,8 @@
 #include <cassert>
 #include <type_traits>
 
+#include <config_global.h>
+
 namespace o3tl
 {
 

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

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>
 

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

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>

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>

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 )

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>

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>