libmicrohttpd

commit 601164fa3539f34369374788ad626b1c14e486be
parent dcde217787066e0bdcf0ebe865ed79fca5ac005a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 22 Feb 2016 13:56:26 +0000

-fix as suggested by EG

Diffstat:
M
configure.ac
 | 
8
+++++---
M
src/include/platform.h
 | 
7
+++++--

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -148,12 +148,14 @@ case "$host_os" in
      AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
      CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
      mhd_host_os='Darwin'
+     shutdown_trig_select='yes'
      AC_MSG_RESULT([[$mhd_host_os]])
      ;;
 freebsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
      mhd_host_os='FreeBSD'
+     shutdown_trig_select='yes'
      AC_MSG_RESULT([[$mhd_host_os]])
      ;;
 openbsd*)
@@ -493,7 +495,7 @@ AC_CHECK_DECL([gmtime_s],
              extern "C"
              #endif
              struct tm* gmtime_s(const time_t* time, struct tm* result);
-           ]], [[ 
+           ]], [[
              struct tm res;
              time_t t;
              gmtime_s (&t, &res);
@@ -513,7 +515,7 @@ AC_CHECK_DECL([gmtime_s],
                  extern "C"
                  #endif
                  errno_t gmtime_s(struct tm* _tm, const time_t* time);
-              ]], [[ 
+              ]], [[
                  struct tm res;
                  time_t t;
                  gmtime_s (&res, &t);
@@ -526,7 +528,7 @@ AC_CHECK_DECL([gmtime_s],
             [AC_MSG_RESULT([[no]])
             ])
         ])
-  ], [], 
+  ], [],
   [[#define __STDC_WANT_LIB_EXT1__ 1
     #include<time.h>]])
 
diff --git a/src/include/platform.h b/src/include/platform.h
@@ -34,7 +34,10 @@
 #ifndef MHD_PLATFORM_H
 #define MHD_PLATFORM_H
 
+#ifndef HAVE_USED_MHD_CONFIG_H
+#define HAVE_USED_MHD_CONFIG_H
 #include "MHD_config.h"
+#endif
 
 #ifndef BUILDING_MHD_LIB
 #ifdef _MHD_EXTERN
@@ -43,7 +46,7 @@
 #if defined(_WIN32) && defined(MHD_W32LIB)
 #define _MHD_EXTERN extern
 #elif defined (_WIN32) && defined(MHD_W32DLL)
-#define _MHD_EXTERN __declspec(dllimport) 
+#define _MHD_EXTERN __declspec(dllimport)
 #else
 #define _MHD_EXTERN extern
 #endif
@@ -51,7 +54,7 @@
 #if defined(_WIN32) && defined(MHD_W32LIB)
 #define _MHD_EXTERN extern
 #elif defined (_WIN32) && defined(MHD_W32DLL)
-#define _MHD_EXTERN extern __declspec(dllexport) 
+#define _MHD_EXTERN extern __declspec(dllexport)
 #else
 #define _MHD_EXTERN extern
 #endif