summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-05-07 17:06:49 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-05-07 17:06:49 +0000
commit6f3d16c64aee2ef0eb94aa0e4ab1ce53fd4a5579 (patch)
tree967bda38ba36c242b9304e22b8538b22acaddaa5 /progs
parent42fa81275c67d7d1ad8d255120af0ffeeb46b963 (diff)
assorted warning clean-ups for x86_64, etc (Mikko T.)
Diffstat (limited to 'progs')
-rw-r--r--progs/demos/Makefile2
-rw-r--r--progs/samples/Makefile1
-rw-r--r--progs/samples/blendxor.c2
-rw-r--r--progs/samples/loadppm.c2
-rw-r--r--progs/xdemos/glxgears_fbconfig.c12
5 files changed, 11 insertions, 8 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 5827b46c28..75e2f5878c 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -127,4 +127,4 @@ osdemo32: osdemo32.c
clean:
-rm -f $(PROGS)
-rm -f *.o *~
- -rm -f readtex.[ch]
+ -rm -f readtex.[ch] showbuffer.[ch]
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);
diff --git a/progs/xdemos/glxgears_fbconfig.c b/progs/xdemos/glxgears_fbconfig.c
index cadcaeccf8..ba692b4163 100644
--- a/progs/xdemos/glxgears_fbconfig.c
+++ b/progs/xdemos/glxgears_fbconfig.c
@@ -360,19 +360,19 @@ init_fbconfig_functions(Display *dpy, int scrnum)
if ( glx_1_3_supported ) {
choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXChooseFBConfig");
+ (GLubyte *) "glXChooseFBConfig");
get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXGetVisualFromFBConfig");
+ (GLubyte *) "glXGetVisualFromFBConfig");
create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXCreateNewContext");
+ (GLubyte *) "glXCreateNewContext");
}
else if ( ext_version_supported ) {
choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXChooseFBConfigSGIX");
+ (GLubyte *) "glXChooseFBConfigSGIX");
get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXGetVisualFromFBConfigSGIX");
+ (GLubyte *) "glXGetVisualFromFBConfigSGIX");
create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXCreateContextWithConfigSGIX");
+ (GLubyte *) "glXCreateContextWithConfigSGIX");
}
else {
printf( "This demo requires either GLX 1.3 or %s be supported.\n",