diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-18 18:16:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-18 18:17:38 -0400 |
| commit | 84683f19b4d1c712281036bcabf8dc623e64b26a (patch) | |
| tree | 94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /hw/xfree86/dri | |
| parent | 881953813c7307f2aac4057b48d233e5f4a574cd (diff) | |
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
Diffstat (limited to 'hw/xfree86/dri')
| -rw-r--r-- | hw/xfree86/dri/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xfree86/dri/dri.c | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 6de88e2bb..e711846b2 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -7,9 +7,9 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_XORG_CONFIG_H \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + \ + \ + \ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ \ @GL_CFLAGS@ diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index b58b670a2..462b9ad44 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -69,7 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mi.h" #include "mipointer.h" -#if defined(XFree86LOADER) && !defined(PANORAMIX) +#if !defined(PANORAMIX) extern Bool noPanoramiXExtension; #endif @@ -135,14 +135,9 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) * If Xinerama is on, don't allow DRI to initialise. It won't be usable * anyway. */ -#if defined(PANORAMIX) && !defined(XFree86LOADER) - xineramaInCore = TRUE; -#elif defined(XFree86LOADER) if (xf86LoaderCheckSymbol("noPanoramiXExtension")) xineramaInCore = TRUE; -#endif -#if defined(PANORAMIX) || defined(XFree86LOADER) if (xineramaInCore) { if (!noPanoramiXExtension) { DRIDrvMsg(pScreen->myNum, X_WARNING, @@ -150,7 +145,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) return FALSE; } } -#endif drmWasAvailable = drmAvailable(); |