[asterisk-scf-commits] asterisk-scf/release/pjproject.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Jul 24 15:35:58 CDT 2012


branch "master" has been updated
       via  756114fee0713bc7692cee636cb580b4fd41f28b (commit)
      from  e7e835bf02e9d708579cd441c28d9fb099a33423 (commit)

Summary of changes:
 pjlib/include/pj/config.h      |   10 ++++++----
 pjlib/include/pj/config_site.h |    6 ++++++
 2 files changed, 12 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 756114fee0713bc7692cee636cb580b4fd41f28b
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jul 24 18:05:08 2012 -0230

    Enable larger sets of IO handles.

diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index b2107b0..afeb37a 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -618,10 +618,12 @@
     /* When FD_SETSIZE is not changeable, check if PJ_IOQUEUE_MAX_HANDLES
      * is lower than FD_SETSIZE value.
      */
-#   ifdef FD_SETSIZE
-#	if PJ_IOQUEUE_MAX_HANDLES > FD_SETSIZE
-#	    error "PJ_IOQUEUE_MAX_HANDLES is greater than FD_SETSIZE"
-#	endif
+#   ifndef ASTSCF_PJ_EPOLL 
+#       ifdef FD_SETSIZE 
+#	    if PJ_IOQUEUE_MAX_HANDLES > FD_SETSIZE
+#	        error "PJ_IOQUEUE_MAX_HANDLES is greater than FD_SETSIZE"
+#	    endif
+#       endif
 #   endif
 #endif
 
diff --git a/pjlib/include/pj/config_site.h b/pjlib/include/pj/config_site.h
index 8d63684..28b7537 100644
--- a/pjlib/include/pj/config_site.h
+++ b/pjlib/include/pj/config_site.h
@@ -27,6 +27,12 @@
 // Windows threads. 
 #define PJ_THREAD_DEFAULT_STACK_SIZE 16384
 
+#else
+
+#undef PJ_IOQUEUE_MAX_HANDLES
+#define PJ_IOQUEUE_MAX_HANDLES	16384
+#define ASTSCF_PJ_EPOLL
+
 #endif  // PJ_WIN32
 
 

-----------------------------------------------------------------------


-- 
asterisk-scf/release/pjproject.git



More information about the asterisk-scf-commits mailing list