Kaydet (Commit) 1f393e01 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

For convenience, include config_global.h in sal/config.h

...which must be included first thing everywhere anyway.

Change-Id: Idbbf941b526f48a89d6398e19404b1ff0e23a6b4
üst 9c281fda
...@@ -19,14 +19,12 @@ ...@@ -19,14 +19,12 @@
#ifndef INCLUDED_RTL_ALLOCATOR_HXX #ifndef INCLUDED_RTL_ALLOCATOR_HXX
#define INCLUDED_RTL_ALLOCATOR_HXX #define INCLUDED_RTL_ALLOCATOR_HXX
#include "sal/config.h"
#include "sal/types.h" #include "sal/types.h"
#include "rtl/alloc.h" #include "rtl/alloc.h"
#include <cstddef> #include <cstddef>
#if defined LIBO_INTERNAL_ONLY
#include "config_global.h"
#endif
/// @cond INTERNAL /// @cond INTERNAL
//###################################################### //######################################################
......
...@@ -20,9 +20,7 @@ ...@@ -20,9 +20,7 @@
#ifndef INCLUDED_RTL_INSTANCE_HXX #ifndef INCLUDED_RTL_INSTANCE_HXX
#define INCLUDED_RTL_INSTANCE_HXX #define INCLUDED_RTL_INSTANCE_HXX
#if defined LIBO_INTERNAL_ONLY #include "sal/config.h"
#include <config_global.h>
#endif
#include "osl/doublecheckedlocking.h" #include "osl/doublecheckedlocking.h"
#include "osl/getglobalmutex.hxx" #include "osl/getglobalmutex.hxx"
......
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
#include "sal/config.h" #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 // Manually defining RTL_DISABLE_FAST_STRING allows to force turning fast string concatenation off
// (e.g. for debugging). // (e.g. for debugging).
#ifndef RTL_DISABLE_FAST_STRING #ifndef RTL_DISABLE_FAST_STRING
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
#ifndef _SAL_CONFIG_H_ #ifndef _SAL_CONFIG_H_
#define _SAL_CONFIG_H_ #define _SAL_CONFIG_H_
#if defined LIBO_INTERNAL_ONLY
#include "config_global.h"
#endif
#ifndef INCLUDED_STDLIB_H #ifndef INCLUDED_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#define INCLUDED_STDLIB_H #define INCLUDED_STDLIB_H
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#include <sal/config.h> #include <sal/config.h>
#include <sal/macros.h> #include <sal/macros.h>
#if defined LIBO_INTERNAL_ONLY
#include <config_global.h>
#endif
#include <sal/typesizes.h> #include <sal/typesizes.h>
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment