diff options
author | David Robillard <d@drobilla.net> | 2012-01-31 22:28:18 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-01-31 22:28:18 +0000 |
commit | fe3491419b084c2d41ad9f29274325e6c0043856 (patch) | |
tree | e50dcaea6879029f2a80f3b8884a36620ecea55d /zix/common.h | |
parent | 86826ae6733119d462be9f3642161db895756643 (diff) | |
download | zix-fe3491419b084c2d41ad9f29274325e6c0043856.tar.gz zix-fe3491419b084c2d41ad9f29274325e6c0043856.tar.bz2 zix-fe3491419b084c2d41ad9f29274325e6c0043856.zip |
Windows/Visual C++ portability.
git-svn-id: http://svn.drobilla.net/zix/trunk@51 df6676b4-ccc9-40e5-b5d6-7c4628a128e3
Diffstat (limited to 'zix/common.h')
-rw-r--r-- | zix/common.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/zix/common.h b/zix/common.h index c0dffeb..ab7e431 100644 --- a/zix/common.h +++ b/zix/common.h @@ -17,8 +17,6 @@ #ifndef ZIX_COMMON_H #define ZIX_COMMON_H -#include <stdbool.h> - /** @addtogroup zix @{ @@ -26,7 +24,7 @@ /** @cond */ #ifdef ZIX_SHARED -# ifdef __WIN32__ +# ifdef _WIN32 # define ZIX_LIB_IMPORT __declspec(dllimport) # define ZIX_LIB_EXPORT __declspec(dllexport) # else @@ -43,6 +41,12 @@ #endif /** @endcond */ +#ifdef __cplusplus +extern "C" { +#else +# include <stdbool.h> +#endif + typedef enum { ZIX_STATUS_SUCCESS, ZIX_STATUS_ERROR, @@ -66,7 +70,12 @@ typedef bool (*ZixEqualFunc)(const void* a, const void* b); */ typedef void (*ZixDestroyFunc)(void* ptr); -/**@} +/** + @} */ +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* ZIX_COMMON_H */ |