commit 49d17ea85e455f68ad1f0da26c911ecdfc02411c parent 001c1fdad596c41a67f08653ada5d46401dd9792 Author: Evgeny Grin (Karlson2k) <k2k@narod.ru> Date: Mon, 22 Dec 2014 19:42:38 +0000 Rework _MHD_EXTERN definition for VS project Diffstat:
| M | src/include/microhttpd.h | | | 7 | +++++++ |
| M | src/include/platform.h | | | 14 | ++++++++++++++ |
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h @@ -166,7 +166,14 @@ typedef intptr_t ssize_t; #endif #ifndef _MHD_EXTERN +#if defined(_WIN32) && defined(MHD_W32LIB) #define _MHD_EXTERN extern +#elif defined (_WIN32) && defined(MHD_W32DLL) +/* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ +#define _MHD_EXTERN __declspec(dllimport) +#else +#define _MHD_EXTERN extern +#endif #endif #ifndef MHD_SOCKET_DEFINED diff --git a/src/include/platform.h b/src/include/platform.h @@ -40,7 +40,21 @@ #ifdef _MHD_EXTERN #undef _MHD_EXTERN #endif /* _MHD_EXTERN */ +#if defined(_WIN32) && defined(MHD_W32LIB) #define _MHD_EXTERN extern +#elif defined (_WIN32) && defined(MHD_W32DLL) +#define _MHD_EXTERN __declspec(dllimport) +#else +#define _MHD_EXTERN extern +#endif +#elif !defined(_MHD_EXTERN) /* && BUILDING_MHD_LIB */ +#if defined(_WIN32) && defined(MHD_W32LIB) +#define _MHD_EXTERN extern +#elif defined (_WIN32) && defined(MHD_W32DLL) +#define _MHD_EXTERN extern __declspec(dllexport) +#else +#define _MHD_EXTERN extern +#endif #endif /* BUILDING_MHD_LIB */ #define _XOPEN_SOURCE_EXTENDED 1