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
committerJosé Fonseca <jfonseca@vmware.com>2011-07-11 20:03:33 +0100
commitc93eb9e96aa38eaf79671f9086ac36f586c5704d (patch)
tree721e7b33111a3afe7d37e618409adcefdb3b39d7 /src/glut/glx/glut_dstr.c
parent8cca523241a7f60e62cb69aa7626f3621c4ba26f (diff)
downloadglut-c93eb9e96aa38eaf79671f9086ac36f586c5704d.tar.gz
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 981e88f..ec9386f 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");