summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-08-13 21:05:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-08-13 21:05:02 +0000
commitb1872fed15311b439cba386991d435ff7532530a (patch)
tree271e1762443767bae859f110599f9d80e0b620c4 /progs
parent2fe6e913ca9ec82d2b7e5b9421a8048cf4118da7 (diff)
silence a warning
Diffstat (limited to 'progs')
-rw-r--r--progs/xdemos/wincopy.c2
-rw-r--r--progs/xdemos/xuserotfont.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/progs/xdemos/wincopy.c b/progs/xdemos/wincopy.c
index 04fa98a78a..3ec67dc672 100644
--- a/progs/xdemos/wincopy.c
+++ b/progs/xdemos/wincopy.c
@@ -32,7 +32,7 @@
*/
-
+#define GLX_GLXEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glx.h>
#include <X11/keysym.h>
diff --git a/progs/xdemos/xuserotfont.c b/progs/xdemos/xuserotfont.c
index c7724818d5..adb849511d 100644
--- a/progs/xdemos/xuserotfont.c
+++ b/progs/xdemos/xuserotfont.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.0
+ * Version: 6.1
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
@@ -276,7 +276,7 @@ glXUseRotatedXFontMESA(Font font, int first, int count, int listbase,
const unsigned int c = first + i;
const int list = listbase + i;
unsigned int charWidth, charHeight;
- unsigned int bitmapWidth, bitmapHeight;
+ unsigned int bitmapWidth = 0, bitmapHeight = 0;
GLfloat xOrig, yOrig, xStep, yStep, dtemp;
const XCharStruct *ch;
int xPos, yPos;