summaryrefslogtreecommitdiff
path: root/src/glut/glx/glut_dstr.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-09-02 17:07:00 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-09-02 17:07:00 +0000
commit712e5042de57bb49f5f5c804c56d5015b171a557 (patch)
treee67d625d1eba1cabbe8380988b6f54475474dc64 /src/glut/glx/glut_dstr.c
parent93cfdfe1ef6f184a2e1687367fe4836185ecaa66 (diff)
fix some strict aliasing problems related to choosing framebuffer configs (Matthias Hopf)
Diffstat (limited to 'src/glut/glx/glut_dstr.c')
-rw-r--r--src/glut/glx/glut_dstr.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/glut/glx/glut_dstr.c b/src/glut/glx/glut_dstr.c
index 981e88ffa4..ec9386f3e5 100644
--- a/src/glut/glx/glut_dstr.c
+++ b/src/glut/glx/glut_dstr.c
@@ -1530,11 +1530,7 @@ main(int argc, char **argv)
char *str, buffer[1024];
int tty = isatty(fileno(stdin));
int overlay = 0, showconfig = 0;
-#if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_fbconfig)
- GLXFBConfigSGIX fbc;
-#else
void *fbc;
-#endif
#if !defined(_WIN32)
dpy = XOpenDisplay(NULL);
@@ -1563,10 +1559,10 @@ main(int argc, char **argv)
} else {
if (overlay) {
vinfo = getVisualInfoFromString(str, &treatAsSingle,
- requiredOverlayCriteria, numRequiredOverlayCriteria, requiredOverlayCriteriaMask, (void**) &fbc);
+ requiredOverlayCriteria, numRequiredOverlayCriteria, requiredOverlayCriteriaMask, &fbc);
} else {
vinfo = getVisualInfoFromString(str, &treatAsSingle,
- requiredWindowCriteria, numRequiredWindowCriteria, requiredWindowCriteriaMask, (void**) &fbc);
+ requiredWindowCriteria, numRequiredWindowCriteria, requiredWindowCriteriaMask, &fbc);
}
if (vinfo) {
printf("\n");