Skip to content

Commit fc1e634

Browse files
committed
include/ap_config.h: Include the autoconf generated header that defines what is available.
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
1 parent 29da067 commit fc1e634

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ case $host in
296296
*mingw32*)
297297
APR_SETVAR(APACHE_MPM, [winnt])
298298
APR_ADDTO(CPPFLAGS, [-DAP_DECLARE_EXPORT])
299+
APR_SETIFNULL(ac_cv_func_times, [no])
299300
;;
300301
*aix*)
301302
aixver=`echo $host | sed 's/^[[^0-9]]*//' | sed 's/\.//g'`

include/ap_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)
231231

232232
#include "os.h"
233-
#if !defined(WIN32) && !defined(NETWARE)
233+
#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
234234
#include "ap_config_auto.h"
235235
#include "ap_config_layout.h"
236236
#endif

0 commit comments

Comments
 (0)