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

Timestamp:

Apr 22, 2008 10:38:46 PM (17 years ago)

Author:

bennylp

Message:

Workaround for pj_thread_sleep() failure with ETIMEDOUT in MacOS X (thanks Daniel Mikusa)

File:

• pjproject/trunk/pjlib/src/pj/os_core_unix.c (modified) (1 diff)

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

@@ -706 +706 @@
     usleep(msec * 1000);
 
+    /* MacOS X (reported on 10.5) seems to always set errno to ETIMEDOUT.
+     * It does so because usleep() is declared to return int, and we're
+     * supposed to check for errno only when usleep() returns non-zero. 
+     * Unfortunately, usleep() is declared to return void in other platforms
+     * so it's not possible to always check for the return value (unless 
+     * we add a detection routine in autoconf).
+     *
+     * As a workaround, here we check if ETIMEDOUT is returned and
+     * return successfully if it is.
+     */
+    if (pj_get_native_os_error() == ETIMEDOUT)
+        return PJ_SUCCESS;
+
     return pj_get_os_error();
-;
+
 #endif  /* PJ_RTEMS */
 }