From 6f3d16c64aee2ef0eb94aa0e4ab1ce53fd4a5579 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 7 May 2005 17:06:49 +0000
Subject: assorted warning clean-ups for x86_64, etc (Mikko T.)

---
 progs/samples/Makefile   | 1 +
 progs/samples/blendxor.c | 2 ++
 progs/samples/loadppm.c  | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'progs/samples')

diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index 0a8750698b..f14b7dfc00 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -45,3 +45,4 @@ readtex.o: readtex.c readtex.h
 clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
+	-rm -f readtex.c readtex.h
diff --git a/progs/samples/blendxor.c b/progs/samples/blendxor.c
index 6f34e28461..5bc4aa9bea 100644
--- a/progs/samples/blendxor.c
+++ b/progs/samples/blendxor.c
@@ -14,7 +14,9 @@
 #include <windows.h>
 #endif
 #define GL_GLEXT_LEGACY
+#define GL_GLEXT_PROTOTYPES
 #include <GL/glut.h>
+#include <GL/glext.h>
 
 
 GLenum doubleBuffer;
diff --git a/progs/samples/loadppm.c b/progs/samples/loadppm.c
index b4b1b387fd..be056d6294 100644
--- a/progs/samples/loadppm.c
+++ b/progs/samples/loadppm.c
@@ -37,7 +37,7 @@ static PPMImage *LoadPPM(const char *filename)
 	exit(1);
     }
 
-    if (fscanf(fp, "%d %d", &result->sizeX, &result->sizeY) != 2)
+    if (fscanf(fp, "%lu %lu", &result->sizeX, &result->sizeY) != 2)
     {
 	fprintf(stderr, "Error loading image `%s'\n", filename);
 	exit(1);
-- 
cgit v1.2.3