saldllapi.h is really not included outside of sal itself

furthermore sal/config.h is already included by sal/types.h
so no need to include it twice

Change-Id: Id84122eb102eececc1001ea4a56c556ff775defa

6 files changed, 5 insertions, 26 deletions

diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index c253de78510c..3d4da3121d36 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -113,7 +113,6 @@ $(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/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/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/detail/log.h,sal/detail/log.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx))
diff --git a/sal/inc/sal/saldllapi.h b/sal/inc/sal/saldllapi.h
deleted file mode 100644
index a3de15feb899..000000000000
--- a/sal/inc/sal/saldllapi.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- 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: */
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 3db8cf48aff3..56299d1e915c 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -300,7 +300,11 @@ typedef void *                   sal_Handle;
 #define SAL_EXCEPTION_DLLPRIVATE
 #endif
 
-#include <sal/saldllapi.h>
+#if defined(SAL_DLLIMPLEMENTATION)
+#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
     checked.
diff --git a/sal/textenc/converter.hxx b/sal/textenc/converter.hxx
index fc69ee24110b..7e09088d2971 100644
--- a/sal/textenc/converter.hxx
+++ b/sal/textenc/converter.hxx
@@ -29,9 +29,6 @@
 #ifndef INCLUDED_SAL_TEXTENC_CONVERTER_HXX
 #define INCLUDED_SAL_TEXTENC_CONVERTER_HXX
 
-#include "sal/config.h"
-
-#include "sal/saldllapi.h"
 #include "sal/types.h"
 
 // Internal, non-stable ABI
diff --git a/sal/textenc/convertsimple.hxx b/sal/textenc/convertsimple.hxx
index 3f207ea05e84..505a576dca11 100644
--- a/sal/textenc/convertsimple.hxx
+++ b/sal/textenc/convertsimple.hxx
@@ -30,9 +30,6 @@
 #ifndef INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX
 #define INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX
 
-#include "sal/config.h"
-
-#include "sal/saldllapi.h"
 #include "sal/types.h"
 
 // Internal, non-stable ABI
diff --git a/sal/textenc/handleundefinedunicodetotextchar.hxx b/sal/textenc/handleundefinedunicodetotextchar.hxx
index a3a3c329d9d1..4863150ea09f 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.hxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.hxx
@@ -30,9 +30,6 @@
 #ifndef INCLUDED_SAL_TEXTENC_HANDLEUNDEFINEDUNICODETOTEXTCHAR_HXX
 #define INCLUDED_SAL_TEXTENC_HANDLEUNDEFINEDUNICODETOTEXTCHAR_HXX
 
-#include "sal/config.h"
-
-#include "sal/saldllapi.h"
 #include "sal/types.h"
 
 // Internal, non-stable ABI