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

Revert "saldllapi.h is really not included outside of sal itself"

This reverts commit 2dfe34ce:

* sal/saldllapi.h is about something different than sal/types.h (it is rather a
  mistake of cf77e8a0 "sal: add visibility
  symbols" to shortcut the #include of sal/saldllapi.h into sal/types.h instead
  of the headers that actually need it), not every header needs to include
  sal/types.h

* sal/config.h is the header to always include first (not sal/types.h)

Change-Id: I217f2540197ddb682c6c00e529b812b04b327d73
üst 0d40167c
...@@ -113,6 +113,7 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx)) ...@@ -113,6 +113,7 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/macros.h,sal/macros.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/macros.h,sal/macros.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/main.h,sal/main.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/main.h,sal/main.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/mathconf.h,sal/mathconf.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/mathconf.h,sal/mathconf.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/saldllapi.h,sal/saldllapi.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/types.h,sal/types.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/types.h,sal/types.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/sal/detail/log.h,sal/detail/log.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/detail/log.h,sal/detail/log.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx))
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef INCLUDED_SALDLLAPI_H
#define INCLUDED_SALDLLAPI_H
#include "sal/types.h"
#if defined(SAL_DLLIMPLEMENTATION)
#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#endif /* INCLUDED_SALDLLAPI_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -300,11 +300,7 @@ typedef void * sal_Handle; ...@@ -300,11 +300,7 @@ typedef void * sal_Handle;
#define SAL_EXCEPTION_DLLPRIVATE #define SAL_EXCEPTION_DLLPRIVATE
#endif #endif
#if defined(SAL_DLLIMPLEMENTATION) #include <sal/saldllapi.h>
#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
/** Use this as markup for functions and methods whose return value must be /** Use this as markup for functions and methods whose return value must be
checked. checked.
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
#ifndef INCLUDED_SAL_TEXTENC_CONVERTER_HXX #ifndef INCLUDED_SAL_TEXTENC_CONVERTER_HXX
#define INCLUDED_SAL_TEXTENC_CONVERTER_HXX #define INCLUDED_SAL_TEXTENC_CONVERTER_HXX
#include "sal/config.h"
#include "sal/saldllapi.h"
#include "sal/types.h" #include "sal/types.h"
// Internal, non-stable ABI // Internal, non-stable ABI
......
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
#ifndef INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX #ifndef INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX
#define INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX #define INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX
#include "sal/config.h"
#include "sal/saldllapi.h"
#include "sal/types.h" #include "sal/types.h"
// Internal, non-stable ABI // Internal, non-stable ABI
......
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
#ifndef INCLUDED_SAL_TEXTENC_HANDLEUNDEFINEDUNICODETOTEXTCHAR_HXX #ifndef INCLUDED_SAL_TEXTENC_HANDLEUNDEFINEDUNICODETOTEXTCHAR_HXX
#define INCLUDED_SAL_TEXTENC_HANDLEUNDEFINEDUNICODETOTEXTCHAR_HXX #define INCLUDED_SAL_TEXTENC_HANDLEUNDEFINEDUNICODETOTEXTCHAR_HXX
#include "sal/config.h"
#include "sal/saldllapi.h"
#include "sal/types.h" #include "sal/types.h"
// Internal, non-stable ABI // Internal, non-stable ABI
......
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