Commit 1bcc3fd5 by alokp@chromium.org

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
parent 5d4c28f9
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// //
#include <float.h> #include <float.h>
#include <limits.h>
#include "compiler/localintermediate.h" #include "compiler/localintermediate.h"
#include "compiler/QualifierAlive.h" #include "compiler/QualifierAlive.h"
......
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
#include "compiler/PoolAlloc.h" #include "compiler/PoolAlloc.h"
#include "compiler/Common.h" #ifndef _MSC_VER
#include <stdint.h>
#endif
#include "compiler/InitializeGlobals.h" #include "compiler/InitializeGlobals.h"
#include "compiler/osinclude.h" #include "compiler/osinclude.h"
...@@ -168,7 +171,7 @@ void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, co ...@@ -168,7 +171,7 @@ void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, co
char assertMsg[80]; char assertMsg[80];
// We don't print the assert message. It's here just to be helpful. // 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()); locText, size, data());
assert(0 && "PoolAlloc: Damage in guard block"); assert(0 && "PoolAlloc: Damage in guard block");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment