Keeps us from needing to add glx/ to the include path everywhere, since we can't add it to the dix include path because the header file names conflict with glxproxy.
Signed-off-by: Adam Jackson <[email protected]> --- glx/glxserver.h | 11 +---------- include/glx_extinit.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/glx/glxserver.h b/glx/glxserver.h index 31c635b97..8a3e6f98b 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -63,6 +63,7 @@ typedef struct __GLXcontext __GLXcontext; #include "glxscreens.h" #include "glxdrawable.h" #include "glxcontext.h" +#include "glx_extinit.h" extern __GLXscreen *glxGetScreen(ScreenPtr pScreen); extern __GLXclientState *glxGetClient(ClientPtr pClient); @@ -81,16 +82,6 @@ int __glXError(int error); /************************************************************************/ -typedef struct __GLXprovider __GLXprovider; -struct __GLXprovider { - __GLXscreen *(*screenProbe) (ScreenPtr pScreen); - const char *name; - __GLXprovider *next; -}; -extern __GLXprovider __glXDRISWRastProvider; - -void GlxPushProvider(__GLXprovider * provider); - enum { GLX_MINIMAL_VISUALS, GLX_TYPICAL_VISUALS, diff --git a/include/glx_extinit.h b/include/glx_extinit.h index ad4741dd1..710ca6e3e 100644 --- a/include/glx_extinit.h +++ b/include/glx_extinit.h @@ -29,6 +29,18 @@ /* this is separate due to sdksyms pulling in extinit.h */ #ifdef GLXEXT extern void GlxExtensionInit(void); + +typedef struct __GLXprovider __GLXprovider; +typedef struct __GLXscreen __GLXscreen; +struct __GLXprovider { + __GLXscreen *(*screenProbe) (ScreenPtr pScreen); + const char *name; + __GLXprovider *next; +}; +extern __GLXprovider __glXDRISWRastProvider; + +void GlxPushProvider(__GLXprovider * provider); + #endif #endif -- 2.14.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
