(file) Return to xf86Init.c CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86 / common

Diff for /xc/programs/Xserver/hw/xfree86/common/xf86Init.c between version 3.42 and 3.43

version 3.42, 1996/02/09 08:20:27 version 3.43, 1996/02/18 03:42:49
Line 1 
Line 1 
 /* /*
  * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.41 1996/02/04 09:06:12 dawes Exp $   * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.42 1996/02/09 08:20:27 dawes Exp $
  *  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *  *
Line 40 
Line 40 
  
 #include "compiler.h" #include "compiler.h"
  
   #include "xf86.h"
 #include "xf86Procs.h" #include "xf86Procs.h"
 #include "xf86_OSlib.h" #include "xf86_OSlib.h"
 #include "xf86Version.h" #include "xf86Version.h"
   #include "mipointer.h"
  
 #ifdef XTESTEXT1 #ifdef XTESTEXT1
 #include "atKeynames.h" #include "atKeynames.h"
Line 121 
Line 123 
  
   if (serverGeneration == 1) {   if (serverGeneration == 1) {
  
     if (xf86ServerName = strrchr(argv[0], '/'))      if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
       xf86ServerName++;       xf86ServerName++;
     else     else
       xf86ServerName = argv[0];       xf86ServerName = argv[0];
Line 221 
Line 223 
          "\n *** A configured device found, but display modes could not be resolved.***\n\n");          "\n *** A configured device found, but display modes could not be resolved.***\n\n");
     if (xf86ProbeOnly)     if (xf86ProbeOnly)
     {     {
       extern void AbortDDX();  
       xf86VTSema = FALSE;       xf86VTSema = FALSE;
       OsCleanup();       OsCleanup();
       AbortDDX();       AbortDDX();


Legend:
Removed from v.3.42  
changed lines
  Added in v.3.43

Powered by
ViewCVS 0.9.2