assorted warning clean-ups for x86_64, etc (Mikko T.)
diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index 0a87506..f14b7df 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -45,3 +45,4 @@
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 6f34e28..5bc4aa9 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 b4b1b38..be056d6 100644
--- a/progs/samples/loadppm.c
+++ b/progs/samples/loadppm.c
@@ -37,7 +37,7 @@
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);