[GNUnet-SVN] r34753 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2014-12-22 20:41:33 +0100 (Mon, 22 Dec 2014)
New Revision: 34753

Modified:
   libmicrohttpd/src/microhttpd/tsearch.c
   libmicrohttpd/src/microhttpd/tsearch.h
Log:
tsearch.c/.h: support compiling by MSVC

Modified: libmicrohttpd/src/microhttpd/tsearch.c
===================================================================
--- libmicrohttpd/src/microhttpd/tsearch.c      2014-12-22 19:41:26 UTC (rev 
34752)
+++ libmicrohttpd/src/microhttpd/tsearch.c      2014-12-22 19:41:33 UTC (rev 
34753)
@@ -11,9 +11,11 @@
  * Totally public domain.
  */
 
+#ifndef _MSC_FULL_VER
 #include <sys/cdefs.h>
+#endif //! _MSC_FULL_VER
 #define _SEARCH_PRIVATE
-#include <tsearch.h>
+#include "tsearch.h"
 #include <stdlib.h>
 
 /* find or insert datum into search tree */

Modified: libmicrohttpd/src/microhttpd/tsearch.h
===================================================================
--- libmicrohttpd/src/microhttpd/tsearch.h      2014-12-22 19:41:26 UTC (rev 
34752)
+++ libmicrohttpd/src/microhttpd/tsearch.h      2014-12-22 19:41:33 UTC (rev 
34753)
@@ -9,7 +9,18 @@
 #ifndef _SEARCH_H_
 #define _SEARCH_H_
 
+#ifndef _MSC_FULL_VER
 #include <sys/cdefs.h>
+#endif  /* _MSC_FULL_VER */
+#if !defined(__BEGIN_DECLS) || !defined(__END_DECLS)
+#if defined(__cplusplus)
+#define        __BEGIN_DECLS   extern "C" {
+#define        __END_DECLS     };
+#else  /* !__cplusplus */
+#define        __BEGIN_DECLS
+#define        __END_DECLS
+#endif /* !__cplusplus */
+#endif /* !__BEGIN_DECLS || !__END_DECLS */
 #include <sys/types.h>
 
 typedef        enum {