Ticket #10638: 0001-Fix-64-bit-build-of-Haiku3D.patch

src/apps/haiku3d/RenderView.cpp

@@ -257 +257 @@
 
 
 void
-RenderView::ErrorCallback(uint32 error)
+RenderView::ErrorCallback(unsigned long error)
 {
     fprintf(stderr, "OpenGL error (%li): %s\n", error, gluErrorString(error));
 }

src/apps/haiku3d/RenderView.h

@@ -24 +24 @@
 
     virtual void    AttachedToWindow();
     virtual void    FrameResized(float width, float height);
-    virtual void    ErrorCallback(uint32 error);
+    virtual void    ErrorCallback(unsigned long error);
 
 protected:
     void            _InitGL();

src/apps/haiku3d/mesh/StaticMesh.cpp

@@ -49 +49 @@
         return;
     }
 
-    fscanf(f, "%lu", &fFaceCount);
+    fscanf(f, "%" B_PRIu32, &fFaceCount);
     fFaces = new Face[fFaceCount];
 
     for (uint32 i = 0; i < fFaceCount; i++) {
 
         uint32 vertexCount = 0;
-        fscanf(f, "%lu", &vertexCount);
+        fscanf(f, "%" B_PRIu32, &vertexCount);
         fFaces[i].vertexCount = vertexCount;
 
         for (uint32 vi = 0; vi < vertexCount; vi++) {
@@ -68 +68 @@
     }
 
     fclose(f);
-    printf("Mesh::_ReadText, loaded %s (%lu faces)\n", fileName, fFaceCount);
+    printf("Mesh::_ReadText, loaded %s (%" B_PRIu32 " faces)\n", fileName, fFaceCount);
 }
 
 
@@ -89 +89 @@
             file.Write(&fFaces[i].v[vi], sizeof(Vertex));
         }
     }
-    printf("Mesh::_WriteBinary, wrote %s (%lu faces)\n", fileName, fFaceCount);
+    printf("Mesh::_WriteBinary, wrote %s (%"  B_PRIu32 " faces)\n", fileName, fFaceCount);
 }
 
 
@@ -111 +111 @@
             file.Read(&fFaces[i].v[vi], sizeof(Vertex));
         }
     }
-    printf("Mesh::_ReadBinary, loaded %s (%lu faces)\n", fileName, fFaceCount);
+    printf("Mesh::_ReadBinary, loaded %s (%" B_PRIu32 " faces)\n", fileName, fFaceCount);
 }
 
 
@@ -146 +146 @@
             memoryIO.Read(&fFaces[i].v[vi], sizeof(Vertex));
         }
     }
-    printf("Mesh::_ReadResource, loaded %s (%lu faces)\n", resourceName,
+    printf("Mesh::_ReadResource, loaded %s (%" B_PRIu32 " faces)\n", resourceName,
         fFaceCount);
 }
 

src/apps/haiku3d/texture/BitmapTexture.cpp

@@ -43 +43 @@
         0, GL_BGRA, GL_UNSIGNED_BYTE,
         bitmap->Bits());
 
-    printf("BitmapTexture::_Load, loaded texture %u (%li, %li, %libits)\n",
+    printf("BitmapTexture::_Load, loaded texture %u (%" B_PRId32 ", %" B_PRId32
+            ", %" B_PRId32 "bits)\n",
         fId, (int32) bitmap->Bounds().Width(),
         (int32) bitmap->Bounds().Height(),
         8 * bitmap->BytesPerRow() / (int)bitmap->Bounds().Width());