diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-10-25 12:19:30 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-10-25 12:19:30 -0400 |
| commit | b633d54b94d746d26e13014634d9f63bbb7e8f7d (patch) | |
| tree | 4832d035672164284ff8698d5875e9d5435f494a /mi | |
| parent | 4b05f19cb9e42d8c8eff5ca4e463f5bc2a05433d (diff) | |
| parent | 48ca5961caee62f2980017a6bdc96a1b4c747727 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 2540975ac..c1ed6e74a 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -352,7 +352,6 @@ extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); extern __GLXprovider __glXMesaProvider; extern void GlxPushProvider(__GLXprovider *impl); extern void GlxExtensionInit(INITARGS); -extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); #endif // INXDARWINAPP #endif // GLXEXT #ifdef XF86DRI @@ -678,9 +677,7 @@ InitVisualWrap() { miResetInitVisuals(); #ifdef GLXEXT -#ifndef __DARWIN__ - GlxWrapInitVisuals(&miInitVisualsProc); -#else +#ifdef __DARWIN__ DarwinGlxWrapInitVisuals(&miInitVisualsProc); #endif #endif |