diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:17 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:17 +0200 |
commit | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (patch) | |
tree | 0a48edd9993da453e0c22393850cac9cb8c08e13 /sw | |
parent | e34be63fd6a257f5225b9306e44cb5ec8dd11efd (diff) |
fixing rebase errors
Diffstat (limited to 'sw')
-rw-r--r-- | sw/Library_swd.mk | 2 | ||||
-rw-r--r-- | sw/inc/swddllapi.h | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 32bcc4868126..1979b04cbcf3 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -43,6 +43,8 @@ $(eval $(call gb_Library_set_include,swd,\ $(eval $(call gb_Library_add_defs,swd,\ -DSWD_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_add_linked_libs,swd,\ comphelper \ cppu \ diff --git a/sw/inc/swddllapi.h b/sw/inc/swddllapi.h new file mode 100644 index 000000000000..07b0b389c191 --- /dev/null +++ b/sw/inc/swddllapi.h @@ -0,0 +1,13 @@ +#ifndef INCLUDED_SWDDLLAPI_H +#define INCLUDED_SWDDLLAPI_H + +#include "sal/types.h" + +#if defined(SWD_DLLIMPLEMENTATION) +#define SWD_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SWD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define SWD_DLLPRIVATE SAL_DLLPRIVATE + +#endif /* INCLUDED_SWDDLLAPI_H */ |