diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-12-13 18:38:25 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-12-13 18:38:25 -0500 |
| commit | c8feb73f5841e7812d8dfdb91f1064e2033d028c (patch) | |
| tree | 4f176f28ec27a4e5bfb9c671e569838741b6bfbd /mi | |
| parent | 9a7ce573636e349ee2967991c7cc1407e80ae524 (diff) | |
| parent | a125ce4a84f5fb5934fefebd7cfb22a83180874d (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/micoord.h | 2 | ||||
| -rw-r--r-- | mi/midispcur.c | 3 | ||||
| -rw-r--r-- | mi/miinitext.c | 19 |
3 files changed, 2 insertions, 22 deletions
diff --git a/mi/micoord.h b/mi/micoord.h index 16a244b96..16d086117 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -46,7 +46,7 @@ #if defined(mips) || defined(sgi) || \ defined(sparc) || defined(__sparc64__) || \ defined(__alpha) || defined(__alpha__) || \ - defined(__i386__) || defined(__ia64__) || \ + defined(__i386__) || defined(__i386) || defined(__ia64__) || \ defined(__s390x__) || defined(__s390__) || \ defined(__amd64__) || defined(amd64) || defined(__amd64) #define GetHighWord(x) (((int) (x)) >> 16) diff --git a/mi/midispcur.c b/mi/midispcur.c index 1731251fb..45e0e9abe 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -175,9 +175,6 @@ miDCCloseScreen (index, pScreen) tossPix (pScreenPriv->pSave); tossPix (pScreenPriv->pTemp); #ifdef ARGB_CURSOR -#if 0 /* This has been free()d before */ - tossPict (pScreenPriv->pRootPicture); -#endif tossPict (pScreenPriv->pTempPicture); #endif xfree ((pointer) pScreenPriv); diff --git a/mi/miinitext.c b/mi/miinitext.c index c876629c0..d06ab8ad1 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -343,17 +343,10 @@ extern void XFree86DGAExtensionInit(INITARGS); #endif #ifdef GLXEXT typedef struct __GLXprovider __GLXprovider; -#ifdef INXDARWINAPP -extern __GLXprovider* __DarwinglXMesaProvider; -extern void DarwinGlxPushProvider(__GLXprovider *impl); -extern void DarwinGlxExtensionInit(INITARGS); -extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); -#else extern __GLXprovider __glXMesaProvider; extern void GlxPushProvider(__GLXprovider *impl); extern void GlxExtensionInit(INITARGS); -#endif // INXDARWINAPP -#endif // GLXEXT +#endif #ifdef XF86DRI extern void XFree86DRIExtensionInit(INITARGS); #endif @@ -662,25 +655,15 @@ InitExtensions(argc, argv) #endif #ifdef GLXEXT -#ifdef INXDARWINAPP - DarwinGlxPushProvider(__DarwinglXMesaProvider); - if (!noGlxExtension) DarwinGlxExtensionInit(); -#else GlxPushProvider(&__glXMesaProvider); if (!noGlxExtension) GlxExtensionInit(); #endif -#endif } void InitVisualWrap() { miResetInitVisuals(); -#ifdef GLXEXT -#ifdef INXDARWINAPP - DarwinGlxWrapInitVisuals(&miInitVisualsProc); -#endif -#endif } #else /* XFree86LOADER */ |