xserver: Branch 'master'

Adam Jackson ajax at kemper.freedesktop.org
Mon Aug 28 15:20:14 PDT 2006


 hw/xfree86/common/xf86DoScanPci.c |    4 ----
 hw/xfree86/common/xf86Init.c      |    5 -----
 2 files changed, 9 deletions(-)

New commits:
diff-tree ebbdc1342a243b301723390696f742dc91f59764 (from 2fde560bbb9c1148f26fd969dc30c4e736672b7c)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Mon Aug 28 18:17:32 2006 -0400

    Remove calls to LoaderCheckUnresolved(), since it's now a stub.

diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c
index 746ff70..0c6668a 100644
--- a/hw/xfree86/common/xf86DoScanPci.c
+++ b/hw/xfree86/common/xf86DoScanPci.c
@@ -100,10 +100,6 @@ void DoScanPci(int argc, char **argv, in
     LoaderErrorMsg(NULL, "scanpci", errmaj, errmin);
     exit(1);
   }
-  if (LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
-      /* For now, just a warning */
-      xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
-  }
   PciSetup = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
   DisplayPCICardInfo =
     (ScanPciDisplayCardInfoProcPtr)LoaderSymbol("ScanPciDisplayPCICardInfo");
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 408536d..8b4bf14 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -973,11 +973,6 @@ InitOutput(ScreenInfo *pScreenInfo, int 
 #endif
   }
 
-    if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
-	/* For now, just a warning */
-	xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
-    }
-
   xf86PostScreenInit();
 
   xf86InitOrigins();



More information about the xorg-commit mailing list