Misc: Trim and consolidate header file usage

[platform/upstream/libusb.git] / libusb / os / threads_posix.c

diff --git a/libusb/os/threads_posix.c b/libusb/os/threads_posix.c
index 3908907..92bb11d 100644 (file)
--- a/libusb/os/threads_posix.c
+++ b/libusb/os/threads_posix.c
@@ -19,53 +19,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <config.h>
+#include "libusbi.h"
 
-#include <time.h>
-#if defined(__linux__) || defined(__OpenBSD__)
+#if defined(__ANDROID__)
+# include <unistd.h>
+#elif defined(__linux__) || defined(__OpenBSD__)
 # if defined(__OpenBSD__)
 #  define _BSD_SOURCE
 # endif
-# include <unistd.h>
 # include <sys/syscall.h>
-#elif defined(__APPLE__)
-# include <mach/mach.h>
-#elif defined(__CYGWIN__)
-# include <windows.h>
 #endif
 
-#include "threads_posix.h"
-#include "libusbi.h"
-
-int usbi_mutex_init_recursive(pthread_mutex_t *mutex)
-{
-       int err;
-       pthread_mutexattr_t attr;
-
-       err = pthread_mutexattr_init(&attr);
-       if (err != 0)
-               return err;
-
-       /* mutexattr_settype requires _GNU_SOURCE or _XOPEN_SOURCE >= 500 on Linux */
-       err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-       if (err != 0)
-               goto finish;
-
-       err = pthread_mutex_init(mutex, &attr);
-
-finish:
-       pthread_mutexattr_destroy(&attr);
-
-       return err;
-}
-
 int usbi_cond_timedwait(pthread_cond_t *cond,
        pthread_mutex_t *mutex, const struct timeval *tv)
 {
        struct timespec timeout;
        int r;
 
-       r = usbi_backend->clock_gettime(USBI_CLOCK_REALTIME, &timeout);
+       r = usbi_backend.clock_gettime(USBI_CLOCK_REALTIME, &timeout);
        if (r < 0)
                return r;
 
@@ -81,7 +52,7 @@ int usbi_cond_timedwait(pthread_cond_t *cond,
 
 int usbi_get_tid(void)
 {
-       int ret = -1;
+       int ret;
 #if defined(__ANDROID__)
        ret = gettid();
 #elif defined(__linux__)
@@ -91,10 +62,11 @@ int usbi_get_tid(void)
           real thread support. For 5.1 and earlier, -1 is returned. */
        ret = syscall(SYS_getthrid);
 #elif defined(__APPLE__)
-       ret = mach_thread_self();
-       mach_port_deallocate(mach_task_self(), ret);
+       ret = (int)pthread_mach_thread_np(pthread_self());
 #elif defined(__CYGWIN__)
        ret = GetCurrentThreadId();
+#else
+       ret = -1;
 #endif
 /* TODO: NetBSD thread ID support */
        return ret;