diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-21 15:25:35 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-21 15:25:35 -0700 |
| commit | 07ad92d2c4cb07db8487d76efc822fd7b88137cb (patch) | |
| tree | c968006cd181116d833a807f61d2e82373310ef9 /hw/xfree86/common/xf86Configure.c | |
| parent | 18624a9b7cf88e769c53cc3a876b3647c5d5057c (diff) | |
| parent | 22db3fdb54d2f7f6b72638b46c186af6db04e214 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 907e94bcd..aee4507a0 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -39,9 +39,7 @@ #include <pciaccess.h> #include "Pci.h" #include "os.h" -#ifdef XFree86LOADER #include "loaderProcs.h" -#endif #include "xf86.h" #include "xf86Config.h" #include "xf86_OSlib.h" @@ -605,7 +603,6 @@ configureFlagsSection (void) static XF86ConfModulePtr configureModuleSection (void) { -#ifdef XFree86LOADER char **elist, **el; /* Find the list of extension modules. */ const char *esubdirs[] = { @@ -616,10 +613,8 @@ configureModuleSection (void) "fonts", NULL }; -#endif parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec) -#ifdef XFree86LOADER elist = LoaderListDirs(esubdirs, NULL); if (elist) { for (el = elist; *el; el++) { @@ -656,7 +651,6 @@ configureModuleSection (void) } xfree(elist); } -#endif return ptr; } @@ -666,10 +660,8 @@ configureFilesSection (void) { parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec) -#ifdef XFree86LOADER if (xf86ModulePath) ptr->file_modulepath = strdup(xf86ModulePath); -#endif if (defaultFontPath) ptr->file_fontpath = strdup(defaultFontPath); if (rgbPath) @@ -791,10 +783,8 @@ DoConfigure() for (vl = vlist; *vl; vl++) ErrorF("\t%s\n", *vl); -#ifdef XFree86LOADER /* Load all the drivers that were found. */ xf86LoadModules(vlist, NULL); -#endif /* XFree86LOADER */ xfree(vlist); |