diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-13 23:55:31 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-14 03:49:19 -0500 |
| commit | 2dfe34ce0efef6ec0412130a32f755657710363d (patch) | |
| tree | 56e2ddfb5fb98276f953da8b823e17bfd5067776 /sal/inc | |
| parent | 3d654071413bc107e0730dd31261c252f71572bf (diff) | |
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
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/sal/saldllapi.h | 15 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 6 |
2 files changed, 5 insertions, 16 deletions
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. |