From 1631e53a3f6f82b11f2018ee85eca9b1067a1827 Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sourceforge.net>
Date: Mon, 30 Jul 2012 13:23:27 +0300
Subject: [PATCH] Fixed|libdeng: Use "uint32_t" instead of "uint"

Todo for later: Fix the declaration of "uint" on Ubuntu.
---
 doomsday/libdeng/include/de/concurrency.h | 4 ++--
 doomsday/libdeng/include/de/memoryzone.h  | 4 ++--
 doomsday/libdeng/src/concurrency.cpp      | 6 +++---
 doomsday/libdeng/src/memoryzone.c         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doomsday/libdeng/include/de/concurrency.h b/doomsday/libdeng/include/de/concurrency.h
index ea0298dc74..39a76ef1ca 100644
--- a/doomsday/libdeng/include/de/concurrency.h
+++ b/doomsday/libdeng/include/de/concurrency.h
@@ -125,9 +125,9 @@ DENG_PUBLIC int Sys_WaitThread(thread_t handle, int timeoutMs, systhreadexitstat
  *                Can be @c NULL in which case the current thread is assumed.
  * @return  Identifier of the thread.
  */
-DENG_PUBLIC uint Sys_ThreadId(thread_t handle);
+DENG_PUBLIC uint32_t Sys_ThreadId(thread_t handle);
 
-DENG_PUBLIC uint Sys_CurrentThreadId(void);
+DENG_PUBLIC uint32_t Sys_CurrentThreadId(void);
 
 DENG_PUBLIC boolean Sys_InMainThread(void);
 
diff --git a/doomsday/libdeng/include/de/memoryzone.h b/doomsday/libdeng/include/de/memoryzone.h
index f88ba61424..db5de03c88 100644
--- a/doomsday/libdeng/include/de/memoryzone.h
+++ b/doomsday/libdeng/include/de/memoryzone.h
@@ -113,7 +113,7 @@ DENG_PUBLIC void Z_ChangeTag2(void* ptr, int tag);
  */
 DENG_PUBLIC void Z_ChangeUser(void* ptr, void* newUser);
 
-DENG_PUBLIC uint Z_GetId(void* ptr);
+DENG_PUBLIC uint32_t Z_GetId(void* ptr);
 
 /**
  * Get the user of a memory block.
@@ -154,7 +154,7 @@ typedef struct zblockset_s zblockset_t;
  *
  * @return  Ptr to the newly created blockset.
  */
-DENG_PUBLIC zblockset_t* ZBlockSet_New(size_t sizeOfElement, uint batchSize, int tag);
+DENG_PUBLIC zblockset_t* ZBlockSet_New(size_t sizeOfElement, uint32_t batchSize, int tag);
 
 /**
  * Destroy the entire blockset.
diff --git a/doomsday/libdeng/src/concurrency.cpp b/doomsday/libdeng/src/concurrency.cpp
index d295011f88..ca180af7fe 100644
--- a/doomsday/libdeng/src/concurrency.cpp
+++ b/doomsday/libdeng/src/concurrency.cpp
@@ -170,14 +170,14 @@ int Sys_WaitThread(thread_t handle, int timeoutMs, systhreadexitstatus_t* exitSt
     return t->exitValue();
 }
 
-uint Sys_ThreadId(thread_t handle)
+uint32_it Sys_ThreadId(thread_t handle)
 {
     QThread* t = reinterpret_cast<QThread*>(handle);
     if(!t) t = QThread::currentThread();
-    return uint(PTR2INT(t));
+    return uint32_t(PTR2INT(t));
 }
 
-uint Sys_CurrentThreadId(void)
+uint32_t Sys_CurrentThreadId(void)
 {
     return Sys_ThreadId(NULL /*this thread*/);
 }
diff --git a/doomsday/libdeng/src/memoryzone.c b/doomsday/libdeng/src/memoryzone.c
index cedb82cee7..e96238b865 100644
--- a/doomsday/libdeng/src/memoryzone.c
+++ b/doomsday/libdeng/src/memoryzone.c
@@ -1103,7 +1103,7 @@ void* ZBlockSet_Allocate(zblockset_t* set)
     return element;
 }
 
-zblockset_t* ZBlockSet_New(size_t sizeOfElement, unsigned int batchSize, int tag)
+zblockset_t* ZBlockSet_New(size_t sizeOfElement, uint32_t batchSize, int tag)
 {
     zblockset_t* set;