apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject svn commit: r1308923 - in /apr/apr/trunk: include/arch/unix/apr_arch_poll_private.h poll/unix/z_asio.c
Date Tue, 03 Apr 2012 14:07:38 GMT
Author: gregames
Date: Tue Apr  3 14:07:38 2012
New Revision: 1308923

URL: http://svn.apache.org/viewvc?rev=1308923&view=rev
Log:
apr buildbot is dying trying to compile z/OS unique source.  apparently it 
found an aio.h header file.  add a test for the intended platform too.

Modified:
    apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
    apr/apr/trunk/poll/unix/z_asio.c

Modified: apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h?rev=1308923&r1=1308922&r2=1308923&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h (original)
+++ apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h Tue Apr  3 14:07:38 2012
@@ -45,7 +45,7 @@
 #define HAS_PIPES(dt) (dt == APR_POLL_FILE) ? 1 : 0
 #endif
 
-#ifdef HAVE_AIO_H
+#if defined(HAVE_AIO_H) && defined(__MVS__)
 #define _AIO_OS390     /* enable a bunch of z/OS aio.h definitions */
 #include <aio.h>       /* aiocb        */
 #endif
@@ -60,7 +60,7 @@
 #elif defined(HAVE_EPOLL)
 #define POLLSET_USES_EPOLL
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_EPOLL
-#elif defined(HAVE_AIO_H)
+#elif defined(HAVE_AIO_H) && defined(__MVS__)
 #define POLLSET_USES_ASIO
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_ASIO
 #elif defined(HAVE_POLL)

Modified: apr/apr/trunk/poll/unix/z_asio.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/z_asio.c?rev=1308923&r1=1308922&r2=1308923&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/z_asio.c (original)
+++ apr/apr/trunk/poll/unix/z_asio.c Tue Apr  3 14:07:38 2012
@@ -41,7 +41,7 @@
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 
-#ifdef HAVE_AIO_H
+#if defined(HAVE_AIO_H) && defined(__MVS__)
 
 #include <sys/msg.h>  	/* msgget etc   */
 #include <time.h>     	/* timestruct   */
@@ -738,4 +738,4 @@ static apr_pollset_provider_t impl = {
 
 apr_pollset_provider_t *apr_pollset_provider_asio = &impl;
 
-#endif /* __MVS__ */
+#endif /* HAVE_ASIO && __MVS__ */



Mime
View raw message