From f3fec499ca9ee87e4d39ffab5b30c3920e22fa3c Mon Sep 17 00:00:00 2001
From: ToadKing <toadking@toadking.com>
Date: Thu, 7 Nov 2013 21:01:49 -0500
Subject: [PATCH] [GX] enable threads, build warning fixes

---
 Makefile.wii        | 2 +-
 miscellaneous.h     | 2 ++
 thread.c            | 4 ++--
 thread/gx_pthread.h | 6 ++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.wii b/Makefile.wii
index e2ab641304..67b79a1729 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -63,7 +63,7 @@ CFLAGS          += -Iconsole/logger
 endif
 
 
-CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -Wno-char-subscripts 
+CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_THREADS -Wno-char-subscripts 
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g -DDEBUG
diff --git a/miscellaneous.h b/miscellaneous.h
index 351a997526..dbbdb79b16 100644
--- a/miscellaneous.h
+++ b/miscellaneous.h
@@ -21,6 +21,8 @@
 #include <sys/timer.h>
 #elif defined(XENON)
 #include <time/time.h>
+#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
+#include <unistd.h>
 #else
 #include <time.h>
 #endif
diff --git a/thread.c b/thread.c
index 65e5b2f932..21e21d93e6 100644
--- a/thread.c
+++ b/thread.c
@@ -315,7 +315,7 @@ int scond_broadcast(scond_t *cond)
 
 bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
 {
-   struct timespec now;
+   struct timespec now = {0};
 
 #ifdef __MACH__ // OSX doesn't have clock_gettime ... :(
    clock_serv_t cclock;
@@ -329,7 +329,7 @@ bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
    sys_time_sec_t s;
    sys_time_nsec_t n;
    sys_time_get_current_time(&s, &n);
-#else
+#elif !defined(GEKKO) // timeout on libogc is duration, not end time
    clock_gettime(CLOCK_REALTIME, &now);
 #endif
 
diff --git a/thread/gx_pthread.h b/thread/gx_pthread.h
index ff941bd3ec..000e902717 100644
--- a/thread/gx_pthread.h
+++ b/thread/gx_pthread.h
@@ -66,6 +66,7 @@ static inline int pthread_detach(pthread_t thread)
 {
    /* FIXME: pthread_detach equivalent missing? */
    (void)thread;
+   return 0;
 }
 
 static inline int pthread_join(pthread_t thread, void **retval)
@@ -98,6 +99,11 @@ static inline int pthread_cond_signal(pthread_cond_t *cond)
    return LWP_CondSignal(*cond);
 }
 
+static inline int pthread_cond_broadcast(pthread_cond_t *cond)
+{
+   return LWP_CondBroadcast(*cond);
+}
+
 static inline int pthread_cond_destroy(pthread_cond_t *cond)
 {
    return LWP_CondDestroy(*cond);