From 4fb8eecfee121afaf6ebfcf81bd083806ff01f82 Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sourceforge.net>
Date: Mon, 30 Jul 2012 13:58:46 +0300
Subject: [PATCH] Unix|libdeng: Attempting to fix uint/ushort declarations

---
 doomsday/libdeng/include/de/types.h  | 5 +++--
 doomsday/libdeng/src/concurrency.cpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doomsday/libdeng/include/de/types.h b/doomsday/libdeng/include/de/types.h
index 89f528e7f2..47c88402cb 100644
--- a/doomsday/libdeng/include/de/types.h
+++ b/doomsday/libdeng/include/de/types.h
@@ -89,10 +89,11 @@ typedef unsigned long long   uintmax_t;
 
 #endif
 
-#ifndef UNIX
+#ifndef MACOSX
 typedef unsigned int    uint;
 typedef unsigned short  ushort;
-#else
+#endif
+#ifdef UNIX
 #  include <sys/types.h>
 #endif
 
diff --git a/doomsday/libdeng/src/concurrency.cpp b/doomsday/libdeng/src/concurrency.cpp
index ca180af7fe..164ca8a214 100644
--- a/doomsday/libdeng/src/concurrency.cpp
+++ b/doomsday/libdeng/src/concurrency.cpp
@@ -170,7 +170,7 @@ int Sys_WaitThread(thread_t handle, int timeoutMs, systhreadexitstatus_t* exitSt
     return t->exitValue();
 }
 
-uint32_it Sys_ThreadId(thread_t handle)
+uint32_t Sys_ThreadId(thread_t handle)
 {
     QThread* t = reinterpret_cast<QThread*>(handle);
     if(!t) t = QThread::currentThread();