include/ap_config.h: Include the autoconf generated header that defines what is avail...

configure.in: The times function is not really available on mingw32. Disable em.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422197 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 28f5f824792eacd4051593fbee6b3a2bdbecbfac..14b1ba2d9f8b8bc98c8948e445bc9798025714c6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -296,6 +296,7 @@ case $host in
   *mingw32*)
       APR_SETVAR(APACHE_MPM, [winnt])
       APR_ADDTO(CPPFLAGS, [-DAP_DECLARE_EXPORT])
+      APR_SETIFNULL(ac_cv_func_times, [no])
       ;;
   *aix*)
       aixver=`echo $host | sed 's/^[[^0-9]]*//' | sed 's/\.//g'`

diff --git a/include/ap_config.h b/include/ap_config.h
index f729adc0245e2ac046ee9d1255bcdb159e68168f..dd977a6ca03fa40cf6fc02268a2f7ee1c5667e56 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -230,7 +230,7 @@
         APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)
 
 #include "os.h"
-#if !defined(WIN32) && !defined(NETWARE)
+#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
 #include "ap_config_auto.h"
 #include "ap_config_layout.h"
 #endif