[Planeshift-cvs] CVS: planeshift/src/updater fileutil.cpp,1.4,1.5 updater.cpp,1.14,1.15

[Jorrit T. <jo...@us...>]

Update of /cvsroot/planeshift/planeshift/src/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9092/src/updater

Modified Files:
	fileutil.cpp updater.cpp 
Log Message:
- Fixed PS for latest CS changes (COMP_xxx -> CS_COMPILER_xxx and
  OS_xxx -> CS_PLATFORM_xxx).



Index: fileutil.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/updater/fileutil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fileutil.cpp	29 Jul 2004 15:21:52 -0000	1.4
--- fileutil.cpp	2 Aug 2004 10:24:06 -0000	1.5
***************
*** 41,45 ****
      FileStat* filestat = new FileStat;
  
! #ifdef OS_WIN32
      if (filestats.st_mode & _S_IFDIR)
  	filestat->type = FileStat::TYPE_DIRECTORY;
--- 41,45 ----
      FileStat* filestat = new FileStat;
  
! #ifdef CS_PLATFORM_WIN32
      if (filestats.st_mode & _S_IFDIR)
  	filestat->type = FileStat::TYPE_DIRECTORY;
***************
*** 83,87 ****
  }
  
! #ifdef OS_UNIX
  #include <sys/stat.h>
  
--- 83,87 ----
  }
  
! #ifdef CS_PLATFORM_UNIX
  #include <sys/stat.h>
  
***************
*** 98,102 ****
  #endif
  
! #ifdef OS_WIN32
  #include <direct.h>
  
--- 98,102 ----
  #endif
  
! #ifdef CS_PLATFORM_WIN32
  #include <direct.h>
  

Index: updater.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/updater/updater.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** updater.cpp	30 Jul 2004 21:16:08 -0000	1.14
--- updater.cpp	2 Aug 2004 10:24:06 -0000	1.15
***************
*** 47,51 ****
  #include "updaterglobals.h"
  
! #ifdef OS_WIN32
  #include "windows.h"
  #endif
--- 47,51 ----
  #include "updaterglobals.h"
  
! #ifdef CS_PLATFORM_WIN32
  #include "windows.h"
  #endif
***************
*** 596,600 ****
          if(!CopyFile(config->GetTempFile(),changelist[i].file->file))
          {
! #ifdef OS_WIN32
  
              printf("Doing DLL check on %s\n",changelist[i].file->file.GetData());
--- 596,600 ----
          if(!CopyFile(config->GetTempFile(),changelist[i].file->file))
          {
! #ifdef CS_PLATFORM_WIN32
  
              printf("Doing DLL check on %s\n",changelist[i].file->file.GetData());
***************
*** 756,760 ****
  
      csString strPath = path;
! #ifdef OS_WIN32
      if (strPath.GetAt(strPath.Length()-1) != '\\')
      {
--- 756,760 ----
  
      csString strPath = path;
! #ifdef CS_PLATFORM_WIN32
      if (strPath.GetAt(strPath.Length()-1) != '\\')
      {
***************
*** 873,877 ****
  
      // Prepare to enter selfupdating mode
! #ifdef OS_WIN32
      UpdateUpdater();
  #else
--- 873,877 ----
  
      // Prepare to enter selfupdating mode
! #ifdef CS_PLATFORM_WIN32
      UpdateUpdater();
  #else
***************
*** 888,892 ****
  bool Updater::UpdateUpdater()
  {
! #ifdef OS_WIN32
  
      if (!DownloadRegistry ())
--- 888,892 ----
  bool Updater::UpdateUpdater()
  {
! #ifdef CS_PLATFORM_WIN32
  
      if (!DownloadRegistry ())
***************
*** 946,950 ****
  void Updater::CleanUp()
  {
! #ifdef OS_WIN32
      iVFS* vfs = psupdaterengine->GetVFS();
      
--- 946,950 ----
  void Updater::CleanUp()
  {
! #ifdef CS_PLATFORM_WIN32
      iVFS* vfs = psupdaterengine->GetVFS();