(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.184 and 3.185

version 3.184, 2001/10/29 18:16:38 version 3.185, 2002/01/15 01:56:56
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.183 2001/08/15 16:25:21 paulo Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.184 2001/10/29 18:16:38 dawes Exp $ */
  
 /* /*
  * Copyright 1991-1999 by The XFree86 Project, Inc.  * Copyright 1991-1999 by The XFree86 Project, Inc.
Line 57 
Line 57 
 /* forward declarations */ /* forward declarations */
  
 static void xf86PrintBanner(void); static void xf86PrintBanner(void);
   static void xf86PrintMarkers(void);
 static void xf86RunVtInit(void); static void xf86RunVtInit(void);
  
 #ifdef DO_CHECK_BETA #ifdef DO_CHECK_BETA
Line 237 
Line 238 
 #endif #endif
  
     xf86PrintBanner();     xf86PrintBanner();
       xf86PrintMarkers();
     {     {
         time_t t;         time_t t;
         const char *ct;         const char *ct;
Line 1005 
Line 1007 
 #endif #endif
 } }
  
   #ifndef SET_STDERR_NONBLOCKING
   #define SET_STDERR_NONBLOCKING 1
   #endif
   
 /* /*
  * OsVendorInit --  * OsVendorInit --
  *      OS/Vendor-specific initialisations.  Called from OsInit(), which  *      OS/Vendor-specific initialisations.  Called from OsInit(), which
Line 1028 
Line 1034 
   if (!beenHere)   if (!beenHere)
     xf86LogInit();     xf86LogInit();
  
   #if SET_STDERR_NONBLOCKING
           /* Set stderr to non-blocking. */
   #ifndef O_NONBLOCK
   #if defined(FNDELAY)
   #define O_NONBLOCK FNDELAY
   #elif defined(O_NDELAY)
   #define O_NONBLOCK O_NDELAY
   #endif
   #endif
   
   #ifdef O_NONBLOCK
     if (!beenHere) {
   #if !defined(__EMX__)
       if (geteuid() == 0 && getuid() != geteuid())
   #endif
       {
         int status;
   
         status = fcntl(fileno(stderr), F_GETFL, 0);
         if (status != -1) {
           fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);
         }
       }
     }
   #endif
   #endif
   
   beenHere = TRUE;   beenHere = TRUE;
 } }
  
Line 1594 
Line 1627 
 #ifdef XFree86LOADER #ifdef XFree86LOADER
   ErrorF("Module Loader present\n");   ErrorF("Module Loader present\n");
 #endif #endif
   }
   
   static void
   xf86PrintMarkers()
   {
       /* Show what the marker symbols mean */
     ErrorF("Markers: " X_PROBE_STRING " probed, "
                        X_CONFIG_STRING " from config file, "
                        X_DEFAULT_STRING " default setting,\n"
            "         " X_CMDLINE_STRING " from command line, "
                        X_NOTICE_STRING " notice, "
                        X_INFO_STRING " informational,\n"
            "         " X_WARNING_STRING " warning, "
                        X_ERROR_STRING " error, "
                        X_NOT_IMPLEMENTED_STRING " not implemented, "
                        X_UNKNOWN_STRING " unknown.\n");
 } }
  
 static void static void


Legend:
Removed from v.3.184  
changed lines
  Added in v.3.185

Powered by
ViewCVS 0.9.2