From 57eed9c8e4f2d8fefb095ad62a8fe97f1d11fe62 Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Sun, 1 Mar 2015 20:34:16 +1100
Subject: [PATCH] Amend console stack fixes to work with gcc in Ubuntu x64.

---
 Engine/source/console/console.cpp   | 6 +++---
 Engine/source/console/simEvents.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp
index f07fc65ee..81c460d79 100644
--- a/Engine/source/console/console.cpp
+++ b/Engine/source/console/console.cpp
@@ -1758,7 +1758,7 @@ const char *ConsoleValue::getStringValue()
    if(type == TypeInternalString || type == TypeInternalStackString)
       return sval;
    else if (type == TypeInternalStringStackPtr)
-      return STR.mBuffer + (U32)sval;
+      return STR.mBuffer + (uintptr_t)sval;
    if(type == TypeInternalFloat)
       return Con::getData(TypeF32, &fval, 0);
    else if(type == TypeInternalInt)
@@ -1770,9 +1770,9 @@ const char *ConsoleValue::getStringValue()
 StringStackPtr ConsoleValue::getStringStackPtr()
 {
    if (type == TypeInternalStringStackPtr)
-      return (U32)sval;
+      return (uintptr_t)sval;
    else
-      return (U32)-1;
+      return (uintptr_t)-1;
 }
 
 bool ConsoleValue::getBoolValue()
diff --git a/Engine/source/console/simEvents.cpp b/Engine/source/console/simEvents.cpp
index 4aa5c9920..f564aa772 100644
--- a/Engine/source/console/simEvents.cpp
+++ b/Engine/source/console/simEvents.cpp
@@ -129,7 +129,7 @@ ConsoleValueRef SimConsoleThreadExecCallback::waitForResult()
       return retVal;
    }
 
-   return NULL;
+   return (const char*)NULL;
 }
 
 //-----------------------------------------------------------------------------