Changeset 1783 for pjproject/trunk/pjlib/src/pj/os_core_unix.c

Timestamp:

Feb 7, 2008 1:11:39 PM (16 years ago)

Author:

bennylp

Message:

Ticket #470, #471, and #472: Compile error when semaphore.h is not present, Compilation error if pthread_mutexattr_set_type() is not present, and Problem with setting up FD_SETSIZE

File:

• pjproject/trunk/pjlib/src/pj/os_core_unix.c (modified) (4 diffs)

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

@@ -35 +35 @@
 #include <pj/errno.h>
 
-#if defined(PJ_HAS_SEMAPHORE) && PJ_HAS_SEMAPHORE != 0
+#if defined(PJ_HAS_SEMAPHORE_H) && PJ_HAS_SEMAPHORE_H != 0
 #  include <semaphore.h>
 #endif
@@ -949 +949 @@
 
     if (type == PJ_MUTEX_SIMPLE) {
-#if defined(PJ_LINUX) && PJ_LINUX!=0
+#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
+    defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
         rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP);
-#elif defined(PJ_RTEMS) && PJ_RTEMS!=0
+#elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
+       defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE)
         /* Nothing to do, default is simple */
 #else
@@ -957 +959 @@
 #endif
     } else {
-#if defined(PJ_LINUX) && PJ_LINUX!=0
+#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
+     defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
         rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#elif defined(PJ_RTEMS) && PJ_RTEMS!=0
+#elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
+       defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE)
         // Phil Torre <ptorre@zetron.com>:
         // The RTEMS implementation of POSIX mutexes doesn't include 
         // pthread_mutexattr_settype(), so what follows is a hack
         // until I get RTEMS patched to support the set/get functions.
+        //
+        // More info:
+        //   newlib's pthread also lacks pthread_mutexattr_settype(),
+        //   but it seems to have mutexattr.recursive.
         PJ_TODO(FIX_RTEMS_RECURSIVE_MUTEX_TYPE)
         attr.recursive = 1;
@@ -1240 +1248 @@
  */
 #if defined(PJ_EMULATE_RWMUTEX) && PJ_EMULATE_RWMUTEX!=0
-#  include "os_rwmutex.c"
+    /* We need semaphore functionality to emulate rwmutex */
+#   if !defined(PJ_HAS_SEMAPHORE) || PJ_HAS_SEMAPHORE==0
+#       error "Semaphore support needs to be enabled to emulate rwmutex"
+#   endif
+#   include "os_rwmutex.c"
 #else
 struct pj_rwmutex_t