Merge 8aafafe4

Change-Id: I41f097b5b96c4d000b1748b9e0411497d323556a
2012-03-22 12:57:54 -07:00
parent cbd78651ba 8aafafe4bd
commit 40b67a0eb0
10 changed files with 76 additions and 30 deletions
--- a/tools/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp
+++ b/tools/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp
@@ -73,7 +73,7 @@ void *SocketStream::allocBuffer(size_t minSize)
            m_buf = p;
            m_bufsize = allocSize;
        } else {
-            ERR("%s: realloc (%d) failed\n", __FUNCTION__, allocSize);
+            ERR("%s: realloc (%zu) failed\n", __FUNCTION__, allocSize);
            free(m_buf);
            m_buf = NULL;
            m_bufsize = 0;