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

Timestamp:

Oct 4, 2006 8:46:27 PM (18 years ago)

Author:

bennylp

Message:

Fixed compilation errors when threading is disabled (PJ_HAS_THREADS=0) and safe ioqueue unregistration is disabled (PJ_IOQUEUE_HAS_SAFE_UNREG=0). Also increase PJ_IOQUEUE_MAX_HANDLES for minimum config to 16 in config_sample.h [thanks Olivier Gournet].

File:

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

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

@@ -185 +185 @@
 PJ_DEF(pj_bool_t) pj_thread_is_registered(void)
 {
+#if PJ_HAS_THREADS
     return pj_thread_local_get(thread_tls_id) != 0;
+#else
+    pj_assert("pj_thread_is_registered() called in non-threading mode!");
+    return PJ_TRUE;
+#endif
 }
 
@@ -945 +950 @@
     return PJ_SUCCESS;
 #else /* PJ_HAS_THREADS */
-    return (pj_mutex_t*)1;
+    *ptr_mutex = (pj_mutex_t*)1;
+    return PJ_SUCCESS;
 #endif
 }