diff options
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/demos/Makefile | 2 | ||||
| -rw-r--r-- | progs/samples/Makefile | 1 | ||||
| -rw-r--r-- | progs/samples/blendxor.c | 2 | ||||
| -rw-r--r-- | progs/samples/loadppm.c | 2 | ||||
| -rw-r--r-- | progs/xdemos/glxgears_fbconfig.c | 12 |
5 files changed, 11 insertions, 8 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 5827b46c28f..75e2f5878c3 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 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); diff --git a/progs/xdemos/glxgears_fbconfig.c b/progs/xdemos/glxgears_fbconfig.c index cadcaeccf83..ba692b41630 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", |