Unix|libdeng: Attempting to fix uint/ushort declarations

skyjake · Jul 30, 2012 · 4fb8eec · 4fb8eec
1 parent bbc840f
commit 4fb8eec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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();