commit 1bcc3fd59936bfa85a7393579f9419f39704ff58
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 19 17:08:44 2010 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 19 17:08:44 2010 +0000
tree ebd951d1bf7b73ee1c96638650a2d13ed4b9f08b
parent 5d4c28f9d598ed0198e88abbb2a9d23e38c196cc

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

src/compiler/Intermediate.cpp

diff --git a/src/compiler/Intermediate.cpp b/src/compiler/Intermediate.cpp
index f1044b4..51a7b7d 100644
--- 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"

src/compiler/PoolAlloc.cpp

diff --git a/src/compiler/PoolAlloc.cpp b/src/compiler/PoolAlloc.cpp
index 89e8cfa..39567de 100644
--- 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 @@
             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");
         }