You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2011/04/09 22:07:58 UTC
svn commit: r1090664 - in /apr/apr/trunk: build/apr_hints.m4 configure.in
include/apr.hw
Author: trawick
Date: Sat Apr 9 20:07:58 2011
New Revision: 1090664
URL: http://svn.apache.org/viewvc?rev=1090664&view=rev
Log:
improve sync between apr.h and apr.hw
notably, APR_HAS_SENDFILE and APR_HAS_MMAP are now enabled for
MinGW builds
Modified:
apr/apr/trunk/build/apr_hints.m4
apr/apr/trunk/configure.in
apr/apr/trunk/include/apr.hw
Modified: apr/apr/trunk/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_hints.m4?rev=1090664&r1=1090663&r2=1090664&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_hints.m4 (original)
+++ apr/apr/trunk/build/apr_hints.m4 Sat Apr 9 20:07:58 2011
@@ -457,16 +457,22 @@ dnl # Not a problem in 10.20. Ot
APR_SETIFNULL(ac_cv_tcp_nodelay_inherited, [yes])
APR_SETIFNULL(ac_cv_file__dev_zero, [no])
APR_SETIFNULL(ac_cv_func_setpgrp_void, [no])
+ APR_SETIFNULL(ac_cv_func_mmap, [yes])
case $host in
*mingw32*)
APR_SETIFNULL(apr_has_xthread_files, [1])
APR_SETIFNULL(apr_has_user, [1])
APR_SETIFNULL(apr_procattr_user_set_requires_password, [1])
+ dnl The real function is TransmitFile(), not sendfile(), but
+ dnl this bypasses the Linux/Solaris/AIX/etc. test and enables
+ dnl the TransmitFile() implementation.
+ APR_SETIFNULL(ac_cv_func_sendfile, [yes])
;;
*mingwce)
APR_SETIFNULL(apr_has_xthread_files, [0])
APR_SETIFNULL(apr_has_user, [0])
APR_SETIFNULL(apr_procattr_user_set_requires_password, [0])
+ APR_SETIFNULL(ac_cv_func_sendfile, [no])
;;
esac
;;
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1090664&r1=1090663&r2=1090664&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Sat Apr 9 20:07:58 2011
@@ -1289,7 +1289,6 @@ APR_FLAG_HEADERS(
mach-o/dyld.h \
malloc.h \
memory.h \
- mswsock.h \
netdb.h \
osreldate.h \
poll.h \
@@ -1341,6 +1340,18 @@ APR_FLAG_HEADERS(
sys/un.h \
sys/wait.h)
+# Windows' <mswsock.h> requires <windows.h> first
+AC_CACHE_CHECK([for mswsock.h], [apr_cv_hdr_mswsock_h],
+[AC_TRY_CPP(
+[#include <windows.h>
+#include <mswsock.h>
+], [apr_cv_hdr_mswsock_h=yes], [apr_cv_hdr_mswsock_h=no])])
+if test "$apr_cv_hdr_mswsock_h" = "yes"; then
+ mswsockh=1
+else
+ mswsockh=0
+fi
+
# IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
# being included by itself. Check for <netinet/tcp.h> manually,
# including another header file first.
Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=1090664&r1=1090663&r2=1090664&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Sat Apr 9 20:07:58 2011
@@ -122,6 +122,7 @@
#define APR_HAVE_DIRENT_H 0
#define APR_HAVE_ERRNO_H APR_NOT_IN_WCE
#define APR_HAVE_FCNTL_H APR_NOT_IN_WCE
+#define APR_HAVE_IF_ADDRS_H 0
#define APR_HAVE_IO_H APR_NOT_IN_WCE
#define APR_HAVE_LIMITS_H APR_NOT_IN_WCE
#define APR_HAVE_MSWSOCK_H APR_NOT_IN_WCE
@@ -130,6 +131,7 @@
#define APR_HAVE_NETINET_SCTP_H 0
#define APR_HAVE_NETINET_SCTP_UIO_H 0
#define APR_HAVE_NETINET_TCP_H 0
+#define APR_HAVE_PROCESS_H 1
#define APR_HAVE_PTHREAD_H 0
#define APR_HAVE_SEMAPHORE_H 0
#define APR_HAVE_SIGNAL_H APR_NOT_IN_WCE
@@ -222,14 +224,14 @@
#include <sys/types.h>
#endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
#if APR_HAVE_STDDEF_H
#include <stddef.h>
#endif
+#if APR_HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#if APR_HAVE_STDINT_H
#include <stdint.h>
#endif