diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-07-26 19:06:04 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-07-26 19:06:04 +0000 |
| commit | 799208dd44a65b18dda97b4843a27a2628f955f4 (patch) | |
| tree | 4cafbfde85bc8b90db60aad1b11caf097d9bb83c /GL/glx/glxext.c | |
| parent | f15f881727cee9a879bd43be8dc849320f8d3cbd (diff) | |
Bug #377: Make lib{glx,GLcore,dri} work when compiled as dlloader modules.
Diffstat (limited to 'GL/glx/glxext.c')
| -rw-r--r-- | GL/glx/glxext.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index 5e6801744..87c9e1448 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.8 2001/08/23 18:25:40 alanh Exp $ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $ ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the ** License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -30,12 +30,11 @@ #include "micmap.h" -extern __GLXextensionInfo __glDDXExtensionInfo; void GlxWrapInitVisuals(miInitVisualsProcPtr *); void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **privates); -__GLXextensionInfo *__glXExt = &__glDDXExtensionInfo; +static __GLXextensionInfo *__glXExt /* = &__glDDXExtensionInfo */; /* ** Forward declarations. @@ -314,6 +313,8 @@ GlxWrapInitVisuals(miInitVisualsProcPtr *initVisProc) { saveInitVisualsProc = *initVisProc; *initVisProc = GlxInitVisuals; + /* HACK: this shouldn't be done here but it's the earliest time */ + __glXExt = __glXglDDXExtensionInfo(); /* from GLcore */ } /************************************************************************/ |