[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32327 - in libmicrohttpd/src: include microhttpd microspdy
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32327 - in libmicrohttpd/src: include microhttpd microspdy |
Date: |
Wed, 12 Feb 2014 17:36:42 +0100 |
Author: grothoff
Date: 2014-02-12 17:36:42 +0100 (Wed, 12 Feb 2014)
New Revision: 32327
Modified:
libmicrohttpd/src/include/platform.h
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/microspdy/Makefile.am
Log:
From: Karlson2k <address@hidden>
Date: Wed, 12 Feb 2014 14:19:34 +0400
Subject: [PATCH] Fix _MHD_EXTERN if "platform.h" is included in external file
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2014-02-12 14:53:09 UTC (rev
32326)
+++ libmicrohttpd/src/include/platform.h 2014-02-12 16:36:42 UTC (rev
32327)
@@ -36,6 +36,13 @@
#include "MHD_config.h"
+#ifndef BUILDING_MHD_LIB
+#ifdef _MHD_EXTERN
+#undef _MHD_EXTERN
+#endif /* _MHD_EXTERN */
+#define _MHD_EXTERN extern
+#endif /* BUILDING_MHD_LIB */
+
#define _XOPEN_SOURCE_EXTENDED 1
#if OS390
#define _OPEN_THREADS
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2014-02-12 14:53:09 UTC (rev
32326)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2014-02-12 16:36:42 UTC (rev
32327)
@@ -20,6 +20,9 @@
internal.c internal.h \
memorypool.c memorypool.h \
response.c response.h
+libmicrohttpd_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DBUILDING_MHD_LIB=1
libmicrohttpd_la_LDFLAGS = \
$(MHD_LIB_LDFLAGS) \
-version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
Modified: libmicrohttpd/src/microspdy/Makefile.am
===================================================================
--- libmicrohttpd/src/microspdy/Makefile.am 2014-02-12 14:53:09 UTC (rev
32326)
+++ libmicrohttpd/src/microspdy/Makefile.am 2014-02-12 16:36:42 UTC (rev
32327)
@@ -29,6 +29,10 @@
libmicrospdy_la_LDFLAGS = \
$(SPDY_LIB_LDFLAGS)
+libmicrospdy_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DBUILDING_MHD_LIB=1
+
libmicrospdy_la_CFLAGS = -Wextra \
$(SPDY_LIB_CFLAGS)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32327 - in libmicrohttpd/src: include microhttpd microspdy,
gnunet <=