[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34762 - libmicrohttpd/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34762 - libmicrohttpd/src/include |
Date: |
Mon, 22 Dec 2014 20:42:38 +0100 |
Author: Karlson2k
Date: 2014-12-22 20:42:38 +0100 (Mon, 22 Dec 2014)
New Revision: 34762
Modified:
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/include/platform.h
Log:
Rework _MHD_EXTERN definition for VS project
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2014-12-22 19:42:31 UTC (rev
34761)
+++ libmicrohttpd/src/include/microhttpd.h 2014-12-22 19:42:38 UTC (rev
34762)
@@ -166,8 +166,15 @@
#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
/**
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2014-12-22 19:42:31 UTC (rev
34761)
+++ libmicrohttpd/src/include/platform.h 2014-12-22 19:42:38 UTC (rev
34762)
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34762 - libmicrohttpd/src/include,
gnunet <=