apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r744555 - in /apr/apr/trunk: include/arch/unix/apr_arch_poll_private.h poll/unix/pollcb.c poll/unix/pollset.c
Date Sat, 14 Feb 2009 19:12:46 GMT
Author: mturk
Date: Sat Feb 14 19:12:45 2009
New Revision: 744555

URL: http://svn.apache.org/viewvc?rev=744555&view=rev
Log:
For win32 first try poll instead default pollset (select) method

Modified:
    apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
    apr/apr/trunk/poll/unix/pollcb.c
    apr/apr/trunk/poll/unix/pollset.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=744555&r1=744554&r2=744555&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 Sat Feb 14 19:12:45 2009
@@ -65,6 +65,8 @@
 
 #ifdef WIN32
 #define POLL_USES_SELECT
+#undef POLLSET_DEFAULT_METHOD
+#define POLLSET_DEFAULT_METHOD APR_POLLSET_SELECT
 #else
 #ifdef HAVE_POLL
 #define POLL_USES_POLL

Modified: apr/apr/trunk/poll/unix/pollcb.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/pollcb.c?rev=744555&r1=744554&r2=744555&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/pollcb.c (original)
+++ apr/apr/trunk/poll/unix/pollcb.c Sat Feb 14 19:12:45 2009
@@ -145,8 +145,11 @@
                                             apr_pool_t *p,
                                             apr_uint32_t flags)
 {
-    return apr_pollcb_create_ex(pollcb, size, p, flags,
-                                APR_POLLSET_DEFAULT);
+    apr_pollset_method_e method = APR_POLLSET_DEFAULT;
+ #ifdef WIN32
+    method = APR_POLLSET_POLL;
+ #endif       
+    return apr_pollcb_create_ex(pollcb, size, p, flags, method);
 }
 
 APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,

Modified: apr/apr/trunk/poll/unix/pollset.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/pollset.c?rev=744555&r1=744554&r2=744555&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/pollset.c (original)
+++ apr/apr/trunk/poll/unix/pollset.c Sat Feb 14 19:12:45 2009
@@ -312,8 +312,11 @@
                                              apr_pool_t *p,
                                              apr_uint32_t flags)
 {
-    return apr_pollset_create_ex(pollset, size, p, flags,
-                                 APR_POLLSET_DEFAULT);
+    apr_pollset_method_e method = APR_POLLSET_DEFAULT;
+ #ifdef WIN32
+    method = APR_POLLSET_POLL;
+ #endif   
+    return apr_pollset_create_ex(pollset, size, p, flags, method);
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t * pollset)



Mime
View raw message