Changeset 1788

Timestamp:

Feb 8, 2008 3:21:41 PM (16 years ago)

Author:

bennylp

Message:

More ticket #472: Fixed problem when building on Mingw. Now PJ_FD_SETSIZE_SETABLE is only enabled when winsock.h is present

Location:

pjproject/trunk/pjlib

Files:

• include/pj/config.h (modified) (2 diffs)
• src/pj/ioqueue_select.c (modified) (1 diff)
• src/pj/sock_select.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/config.h

@@ -488 +488 @@
  */
 #ifndef PJ_IOQUEUE_MAX_HANDLES
-#   if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0
-#       define PJ_IOQUEUE_MAX_HANDLES   (64)
-#   else
-#       define PJ_IOQUEUE_MAX_HANDLES   (256)
-#   endif
+#   define PJ_IOQUEUE_MAX_HANDLES       (64)
 #endif
 
@@ -533 +529 @@
 /**
  * Determine if FD_SETSIZE is changeable/set-able. If so, then we will
- * set it to PJ_IOQUEUE_MAX_HANDLES.
- */
-/* This is awful, as we should actually check for __GLIBC__ rather than
- * __GNUC__. But alas! Libc headers are not included yet at this stage.
- */
-#ifdef __GNUC__
-#   define PJ_FD_SETSIZE_SETABLE        0
-#else
-#   define PJ_FD_SETSIZE_SETABLE        1
+ * set it to PJ_IOQUEUE_MAX_HANDLES. Currently we detect this by checking
+ * for Winsock.
+ */
+#ifndef PJ_FD_SETSIZE_SETABLE
+#   if defined(PJ_HAS_WINSOCK_H) && PJ_HAS_WINSOCK_H!=0
+#       define PJ_FD_SETSIZE_SETABLE    1
+#   else
+#       define PJ_FD_SETSIZE_SETABLE    0
+#   endif
 #endif
 
 /**
  * Overrides FD_SETSIZE so it is consistent throughout the library.
- * We only do this if we detected that FD_SETSIZE is changeable.
- *
- * Default: #PJ_IOQUEUE_MAX_HANDLES
+ * We only do this if we detected that FD_SETSIZE is changeable. If
+ * FD_SETSIZE is not set-able, then PJ_IOQUEUE_MAX_HANDLES must be
+ * set to value lower than FD_SETSIZE.
  */
 #if PJ_FD_SETSIZE_SETABLE

pjproject/trunk/pjlib/src/pj/ioqueue_select.c

@@ -38 +38 @@
 #include <pj/sock_select.h>
 #include <pj/errno.h>
+
+/* Now that we have access to OS'es <sys/select>, lets check again that
+ * PJ_IOQUEUE_MAX_HANDLES is not greater than FD_SETSIZE
+ */
+#if PJ_IOQUEUE_MAX_HANDLES > FD_SETSIZE
+#   error "PJ_IOQUEUE_MAX_HANDLES cannot be greater than FD_SETSIZE"
+#endif
+
 
 /*

pjproject/trunk/pjlib/src/pj/sock_select.c

@@ -34 +34 @@
 #   pragma warning(disable: 4018)    // Signed/unsigned mismatch in FD_*
 #   pragma warning(disable: 4389)    // Signed/unsigned mismatch in FD_*
-#endif
-
-/* Now that we have access to OS'es <sys/select>, lets check again that
- * PJ_IOQUEUE_MAX_HANDLES is not greater than FD_SETSIZE
- */
-#if PJ_IOQUEUE_MAX_HANDLES > FD_SETSIZE
-#   error "PJ_IOQUEUE_MAX_HANDLES cannot be greater than FD_SETSIZE"
 #endif