From a10ad54c6bd7bd719258ae0a6df63a4d55c1959e Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Sat, 15 Mar 2014 23:36:34 +0100
Subject: [PATCH] Fix a few %l* instead of PRI*32

---
 src/apps/haiku-depot/Model.cpp             |  9 +++++++--
 src/apps/haiku3d/mesh/StaticMesh.cpp       | 20 +++++++++++++-------
 src/apps/haiku3d/texture/BitmapTexture.cpp |  9 ++++++---
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/apps/haiku-depot/Model.cpp b/src/apps/haiku-depot/Model.cpp
index 8c2e36ad17..7c8ffb42b0 100644
--- a/src/apps/haiku-depot/Model.cpp
+++ b/src/apps/haiku-depot/Model.cpp
@@ -4,8 +4,11 @@
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
+#define __STDC_FORMAT_MACROS
+
 #include "Model.h"
 
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -146,10 +149,12 @@ public:
 	{
 		if (package.Get()==NULL)
 			return false;
-printf("TEST %s\n", package->Title().String());
+
+		printf("TEST %s\n", package->Title().String());
+
 		for (int32 i = 0; i < fPackageLists.CountItems(); i++) {
 			if (fPackageLists.ItemAtFast(i)->Contains(package)) {
-printf("  contained in %ld\n", i);
+				printf("  contained in %" PRId32 "\n", i);
 				return false;
 			}
 		}
diff --git a/src/apps/haiku3d/mesh/StaticMesh.cpp b/src/apps/haiku3d/mesh/StaticMesh.cpp
index 16f6fd91ff..c1f68b8e28 100644
--- a/src/apps/haiku3d/mesh/StaticMesh.cpp
+++ b/src/apps/haiku3d/mesh/StaticMesh.cpp
@@ -6,6 +6,8 @@
  * 		Alexandre Deckner <alex@zappotek.com>
  */
 
+#define __STDC_FORMAT_MACROS
+
 #include "StaticMesh.h"
 
 #include <Application.h>
@@ -14,6 +16,7 @@
 #include <File.h>
 #include <String.h>
 
+#include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -49,13 +52,13 @@ StaticMesh::_ReadText(const char* fileName)
 		return;
 	}
 
-	fscanf(f, "%lu", &fFaceCount);
+	fscanf(f, "%" PRIu32, &fFaceCount);
 	fFaces = new Face[fFaceCount];
 
 	for (uint32 i = 0; i < fFaceCount; i++) {
 
 		uint32 vertexCount = 0;
-		fscanf(f, "%lu", &vertexCount);
+		fscanf(f, "%" PRIu32, &vertexCount);
 		fFaces[i].vertexCount = vertexCount;
 
 		for (uint32 vi = 0; vi < vertexCount; vi++) {
@@ -68,7 +71,8 @@ StaticMesh::_ReadText(const char* fileName)
 	}
 
 	fclose(f);
-	printf("Mesh::_ReadText, loaded %s (%lu faces)\n", fileName, fFaceCount);
+	printf("Mesh::_ReadText, loaded %s (%" PRIu32 " faces)\n",
+		fileName, fFaceCount);
 }
 
 
@@ -89,7 +93,8 @@ StaticMesh::_WriteBinary(const char* fileName)
 			file.Write(&fFaces[i].v[vi], sizeof(Vertex));
 		}
 	}
-	printf("Mesh::_WriteBinary, wrote %s (%lu faces)\n", fileName, fFaceCount);
+	printf("Mesh::_WriteBinary, wrote %s (%" PRIu32 " faces)\n",
+		fileName, fFaceCount);
 }
 
 
@@ -111,7 +116,8 @@ StaticMesh::_ReadBinary(const char* fileName)
 			file.Read(&fFaces[i].v[vi], sizeof(Vertex));
 		}
 	}
-	printf("Mesh::_ReadBinary, loaded %s (%lu faces)\n", fileName, fFaceCount);
+	printf("Mesh::_ReadBinary, loaded %s (%" PRIu32 " faces)\n",
+		fileName, fFaceCount);
 }
 
 
@@ -146,8 +152,8 @@ StaticMesh::_ReadResource(const char* resourceName)
 			memoryIO.Read(&fFaces[i].v[vi], sizeof(Vertex));
 		}
 	}
-	printf("Mesh::_ReadResource, loaded %s (%lu faces)\n", resourceName,
-		fFaceCount);
+	printf("Mesh::_ReadResource, loaded %s (%" PRIu32 " faces)\n",
+		resourceName, fFaceCount);
 }
 
 
diff --git a/src/apps/haiku3d/texture/BitmapTexture.cpp b/src/apps/haiku3d/texture/BitmapTexture.cpp
index 654c9107d4..6bced53c68 100644
--- a/src/apps/haiku3d/texture/BitmapTexture.cpp
+++ b/src/apps/haiku3d/texture/BitmapTexture.cpp
@@ -3,15 +3,18 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- * 		Alexandre Deckner <alex@zappotek.com>
+ *		Alexandre Deckner <alex@zappotek.com>
  */
 
+#define __STDC_FORMAT_MACROS
+
 #include "BitmapTexture.h"
 
 #include <Bitmap.h>
 
 #include <GL/gl.h>
 #include <GL/glu.h>
+#include <inttypes.h>
 #include <stdio.h>
 
 
@@ -43,8 +46,8 @@ BitmapTexture::_Load(BBitmap* bitmap) {
 		0, GL_BGRA, GL_UNSIGNED_BYTE,
 		bitmap->Bits());
 
-	printf("BitmapTexture::_Load, loaded texture %u (%li, %li, %libits)\n",
-		fId, (int32) bitmap->Bounds().Width(),
+	printf("BitmapTexture::_Load, loaded texture %u (%" PRIi32 ", %" PRIi32 ", "
+		"%" PRIi32 "bits)\n", fId, (int32) bitmap->Bounds().Width(),
 		(int32) bitmap->Bounds().Height(),
 		8 * bitmap->BytesPerRow() / (int)bitmap->Bounds().Width());