diff options
| author | Brian Paul <[email protected]> | 2005-05-07 17:06:49 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-05-07 17:06:49 +0000 |
| commit | 6f3d16c64aee2ef0eb94aa0e4ab1ce53fd4a5579 (patch) | |
| tree | 967bda38ba36c242b9304e22b8538b22acaddaa5 /progs/samples | |
| parent | 42fa81275c67d7d1ad8d255120af0ffeeb46b963 (diff) | |
assorted warning clean-ups for x86_64, etc (Mikko T.)
Diffstat (limited to 'progs/samples')
| -rw-r--r-- | progs/samples/Makefile | 1 | ||||
| -rw-r--r-- | progs/samples/blendxor.c | 2 | ||||
| -rw-r--r-- | progs/samples/loadppm.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/progs/samples/Makefile b/progs/samples/Makefile index 0a8750698b7..f14b7dfc009 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 6f34e28461c..5bc4aa9bea4 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 b4b1b387fd5..be056d62940 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); |