diff options
| author | Ben Byer <bbyer@apple.com> | 2007-02-17 03:47:42 -0800 |
|---|---|---|
| committer | Ben Byer <bbyer@apple.com> | 2007-02-17 03:47:42 -0800 |
| commit | d287b76471f66c9aea54f969d050b35643cb2501 (patch) | |
| tree | bcfb8700c8f817a0f72dc17e02bd514ecef64ca3 /mi | |
| parent | 81444486be4f182dde778bac6f7edcbfc4368482 (diff) | |
cleaned up some linking ugliness in hw/darwin/quartz
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 2c560d548..0fc6d1521 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -338,18 +338,18 @@ extern void XFree86DGAExtensionInit(INITARGS); #endif #ifdef GLXEXT typedef struct __GLXprovider __GLXprovider; -#ifndef __DARWIN__ -extern __GLXprovider __glXMesaProvider; -extern void GlxPushProvider(__GLXprovider *impl); -extern void GlxExtensionInit(INITARGS); -extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); -#else +#ifdef INXDARWINAPP extern __GLXprovider* __DarwinglXMesaProvider; extern void DarwinGlxPushProvider(__GLXprovider *impl); extern void DarwinGlxExtensionInit(INITARGS); extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); -#endif -#endif +#else +extern __GLXprovider __glXMesaProvider; +extern void GlxPushProvider(__GLXprovider *impl); +extern void GlxExtensionInit(INITARGS); +extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); +#endif // INXDARWINAPP +#endif // GLXEXT #ifdef XF86DRI extern void XFree86DRIExtensionInit(INITARGS); #endif @@ -633,14 +633,14 @@ InitExtensions(argc, argv) #endif #ifdef GLXEXT -#ifndef __DARWIN__ - GlxPushProvider(&__glXMesaProvider); - if (!noGlxExtension) GlxExtensionInit(); -#else +#ifdef INXDARWINAPP + DarwinGlxPushProvider(__DarwinglXMesaProvider); if (!noGlxExtension) DarwinGlxExtensionInit(); +#else GlxPushProvider(&__glXMesaProvider); -#endif -#endif + if (!noGlxExtension) GlxExtensionInit(); +#endif // INXDARWINAPP +#endif // GLXEXT #ifdef XFIXES /* must be before Render to layer DisplayCursor correctly */ if (!noXFixesExtension) XFixesExtensionInit(); |