aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-02-22 13:56:26 +0000
committerChristian Grothoff <christian@grothoff.org>2016-02-22 13:56:26 +0000
commit601164fa3539f34369374788ad626b1c14e486be (patch)
tree45006478b901bac71d6e90f20c06b2e4c2836d8b
parentdcde217787066e0bdcf0ebe865ed79fca5ac005a (diff)
downloadlibmicrohttpd-601164fa3539f34369374788ad626b1c14e486be.tar.gz
libmicrohttpd-601164fa3539f34369374788ad626b1c14e486be.zip
-fix as suggested by EG
-rw-r--r--configure.ac8
-rw-r--r--src/include/platform.h7
2 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 412bd6d1..956fe102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,12 +148,14 @@ case "$host_os" in
148 AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system]) 148 AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
149 CFLAGS="-no-cpp-precomp -fno-common $CFLAGS" 149 CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
150 mhd_host_os='Darwin' 150 mhd_host_os='Darwin'
151 shutdown_trig_select='yes'
151 AC_MSG_RESULT([[$mhd_host_os]]) 152 AC_MSG_RESULT([[$mhd_host_os]])
152 ;; 153 ;;
153freebsd*) 154freebsd*)
154 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) 155 AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
155 AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system]) 156 AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
156 mhd_host_os='FreeBSD' 157 mhd_host_os='FreeBSD'
158 shutdown_trig_select='yes'
157 AC_MSG_RESULT([[$mhd_host_os]]) 159 AC_MSG_RESULT([[$mhd_host_os]])
158 ;; 160 ;;
159openbsd*) 161openbsd*)
@@ -493,7 +495,7 @@ AC_CHECK_DECL([gmtime_s],
493 extern "C" 495 extern "C"
494 #endif 496 #endif
495 struct tm* gmtime_s(const time_t* time, struct tm* result); 497 struct tm* gmtime_s(const time_t* time, struct tm* result);
496 ]], [[ 498 ]], [[
497 struct tm res; 499 struct tm res;
498 time_t t; 500 time_t t;
499 gmtime_s (&t, &res); 501 gmtime_s (&t, &res);
@@ -513,7 +515,7 @@ AC_CHECK_DECL([gmtime_s],
513 extern "C" 515 extern "C"
514 #endif 516 #endif
515 errno_t gmtime_s(struct tm* _tm, const time_t* time); 517 errno_t gmtime_s(struct tm* _tm, const time_t* time);
516 ]], [[ 518 ]], [[
517 struct tm res; 519 struct tm res;
518 time_t t; 520 time_t t;
519 gmtime_s (&res, &t); 521 gmtime_s (&res, &t);
@@ -526,7 +528,7 @@ AC_CHECK_DECL([gmtime_s],
526 [AC_MSG_RESULT([[no]]) 528 [AC_MSG_RESULT([[no]])
527 ]) 529 ])
528 ]) 530 ])
529 ], [], 531 ], [],
530 [[#define __STDC_WANT_LIB_EXT1__ 1 532 [[#define __STDC_WANT_LIB_EXT1__ 1
531 #include<time.h>]]) 533 #include<time.h>]])
532 534
diff --git a/src/include/platform.h b/src/include/platform.h
index bbc97c5e..60369149 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -34,7 +34,10 @@
34#ifndef MHD_PLATFORM_H 34#ifndef MHD_PLATFORM_H
35#define MHD_PLATFORM_H 35#define MHD_PLATFORM_H
36 36
37#ifndef HAVE_USED_MHD_CONFIG_H
38#define HAVE_USED_MHD_CONFIG_H
37#include "MHD_config.h" 39#include "MHD_config.h"
40#endif
38 41
39#ifndef BUILDING_MHD_LIB 42#ifndef BUILDING_MHD_LIB
40#ifdef _MHD_EXTERN 43#ifdef _MHD_EXTERN
@@ -43,7 +46,7 @@
43#if defined(_WIN32) && defined(MHD_W32LIB) 46#if defined(_WIN32) && defined(MHD_W32LIB)
44#define _MHD_EXTERN extern 47#define _MHD_EXTERN extern
45#elif defined (_WIN32) && defined(MHD_W32DLL) 48#elif defined (_WIN32) && defined(MHD_W32DLL)
46#define _MHD_EXTERN __declspec(dllimport) 49#define _MHD_EXTERN __declspec(dllimport)
47#else 50#else
48#define _MHD_EXTERN extern 51#define _MHD_EXTERN extern
49#endif 52#endif
@@ -51,7 +54,7 @@
51#if defined(_WIN32) && defined(MHD_W32LIB) 54#if defined(_WIN32) && defined(MHD_W32LIB)
52#define _MHD_EXTERN extern 55#define _MHD_EXTERN extern
53#elif defined (_WIN32) && defined(MHD_W32DLL) 56#elif defined (_WIN32) && defined(MHD_W32DLL)
54#define _MHD_EXTERN extern __declspec(dllexport) 57#define _MHD_EXTERN extern __declspec(dllexport)
55#else 58#else
56#define _MHD_EXTERN extern 59#define _MHD_EXTERN extern
57#endif 60#endif