summaryrefslogtreecommitdiff
path: root/sal/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-15 11:42:07 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-15 23:20:46 +0200
commite9689e4fdcf876e7bcaf564e060a3512e0fe9ef3 (patch)
tree860cdbd00716a6068423aa9fc8b4afdc6ea4b0ee /sal/inc
parent0d40167cec11faee1488397fa323ae4511ac2050 (diff)
Revert "saldllapi.h is really not included outside of sal itself"
This reverts commit 2dfe34ce0efef6ec0412130a32f755657710363d: * sal/saldllapi.h is about something different than sal/types.h (it is rather a mistake of cf77e8a0b9dc26d5007c76388c3f09231f048bdd "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
Diffstat (limited to 'sal/inc')
-rw-r--r--sal/inc/sal/saldllapi.h15
-rw-r--r--sal/inc/sal/types.h6
2 files changed, 16 insertions, 5 deletions
diff --git a/sal/inc/sal/saldllapi.h b/sal/inc/sal/saldllapi.h
new file mode 100644
index 000000000000..a3de15feb899
--- /dev/null
+++ b/sal/inc/sal/saldllapi.h
@@ -0,0 +1,15 @@
+/* -*- 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 56299d1e915c..3db8cf48aff3 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -300,11 +300,7 @@ typedef void * sal_Handle;
#define SAL_EXCEPTION_DLLPRIVATE
#endif
-#if defined(SAL_DLLIMPLEMENTATION)
-#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
+#include <sal/saldllapi.h>
/** Use this as markup for functions and methods whose return value must be
checked.