(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.135 and 1.137

version 1.135, 2004/05/21 20:57:01 version 1.137, 2004/06/29 16:43:36
Line 112 
Line 112 
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/ShutdownService.h> #include <Pegasus/Server/ShutdownService.h>
 #include <Pegasus/Common/Destroyer.h>  
  
 PEGASUS_USING_PEGASUS; PEGASUS_USING_PEGASUS;
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
 int cimserver_run( int argc, char** argv, Boolean shutdownOption ); int cimserver_run( int argc, char** argv, Boolean shutdownOption );
  
   Uint32 parentPid = 0;
   
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 # include "cimserver_windows.cpp" # include "cimserver_windows.cpp"
 #elif defined(PEGASUS_OS_TYPE_UNIX) #elif defined(PEGASUS_OS_TYPE_UNIX)
Line 746 
Line 747 
     // Get an instance of the Config Manager.     // Get an instance of the Config Manager.
     //     //
     configManager = ConfigManager::getInstance();     configManager = ConfigManager::getInstance();
       configManager->useConfigFiles = true;
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
     // In a special startup case for IBM OS400, when the server is     // In a special startup case for IBM OS400, when the server is
Line 1029 
Line 1031 
 MessageLoader::_useProcessLocale = false; MessageLoader::_useProcessLocale = false;
 //l10n //l10n
  
       // Get the parent's PID before forking
       parentPid = System::getPID();
   
     // do we need to run as a daemon ?     // do we need to run as a daemon ?
     if (daemonOption)     if (daemonOption)
     {     {


Legend:
Removed from v.1.135  
changed lines
  Added in v.1.137

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2