Patching changes from thestig@chromium.org for fixing ANGLE build with gcc 4.4…

Patching changes from thestig@chromium.org for fixing ANGLE build with gcc 4.4 on Karmic. The original CL is here: http://codereview.appspot.com/1255042/show The only changes I have maded is moved the inclusion of stdint.h from PoolAlloc.h to PoolAlloc.cpp with #ifndef _MSC_VER guard. Review URL: http://codereview.appspot.com/1220044 git-svn-id: https://angleproject.googlecode.com/svn/trunk@304 736b8ea6-26fd-11df-bfd4-992fa37f6226

Patching changes from thestig@chromium.org for fixing ANGLE build with gcc 4.4…
1bcc3fd5 · alokp@chromium.org · 5d4c28f9 · 1bcc3fd5 · 1bcc3fd5
Commit 1bcc3fd5 authored May 19, 2010 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Intermediate.cpp src/compiler/Intermediate.cpp +1 -0

PoolAlloc.cpp src/compiler/PoolAlloc.cpp +5 -2

No files found.
--- a/src/compiler/Intermediate.cpp
+++ b/src/compiler/Intermediate.cpp
@@ -9,6 +9,7 @@
 //

 #include <float.h>
+#include <limits.h>

 #include "compiler/localintermediate.h"
 #include "compiler/QualifierAlive.h"

--- a/src/compiler/PoolAlloc.cpp
+++ b/src/compiler/PoolAlloc.cpp
@@ -6,7 +6,10 @@

 #include "compiler/PoolAlloc.h"

-#include "compiler/Common.h"
+#ifndef _MSC_VER
+#include <stdint.h>
+#endif
+
 #include "compiler/InitializeGlobals.h"
 #include "compiler/osinclude.h"

@@ -168,7 +171,7 @@ void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, co
            char assertMsg[80];

            // We don't print the assert message.  It's here just to be helpful.
-            sprintf(assertMsg, "PoolAlloc: Damage %s %lu byte allocation at 0x%p\n",
+            sprintf(assertMsg, "PoolAlloc: Damage %s %u byte allocation at 0x%p\n",
                    locText, size, data());
            assert(0 && "PoolAlloc: Damage in guard block");
        }