[Planeshift-cvs] CVS: planeshift/src/common/util pscssetup.h,1.4,1.5 pserror.cpp,1.8,1.9 serverconsole.cpp,1.8,1.9 sleep.cpp,1.3,1.4

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

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

Modified Files:
	pscssetup.h pserror.cpp serverconsole.cpp sleep.cpp 
Log Message:
- Fixed PS for latest CS changes (COMP_xxx -> CS_COMPILER_xxx and
  OS_xxx -> CS_PLATFORM_xxx).



Index: pscssetup.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/pscssetup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pscssetup.h	19 May 2004 04:36:16 -0000	1.4
--- pscssetup.h	2 Aug 2004 10:24:06 -0000	1.5
***************
*** 24,28 ****
  #define CSSETUP_HEADER
  
! #ifdef COMP_GCC
  #define PS_PAUSEEXIT(x) exit(x)
  #endif
--- 24,28 ----
  #define CSSETUP_HEADER
  
! #ifdef CS_COMPILER_GCC
  #define PS_PAUSEEXIT(x) exit(x)
  #endif

Index: pserror.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/pserror.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pserror.cpp	13 Mar 2004 08:58:03 -0000	1.8
--- pserror.cpp	2 Aug 2004 10:24:06 -0000	1.9
***************
*** 4,8 ****
  #include "util/pserror.h"
  
! #ifdef COMP_MSVC
  #include <conio.h>
  #endif
--- 4,8 ----
  #include "util/pserror.h"
  
! #ifdef CS_COMPILER_MSVC
  #include <conio.h>
  #endif
***************
*** 33,37 ****
  //    ServerConsole::setColor(COL_NORMAL);
      // are we on msvc?
! #ifdef COMP_MSVC
      getch();
  #endif
--- 33,37 ----
  //    ServerConsole::setColor(COL_NORMAL);
      // are we on msvc?
! #ifdef CS_COMPILER_MSVC
      getch();
  #endif

Index: serverconsole.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/serverconsole.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** serverconsole.cpp	4 Jul 2004 04:44:12 -0000	1.8
--- serverconsole.cpp	2 Aug 2004 10:24:06 -0000	1.9
***************
*** 28,32 ****
  #include <memory.h>
  
! #ifdef COMP_VC
  #include <conio.h>
  #endif
--- 28,32 ----
  #include <memory.h>
  
! #ifdef CS_COMPILER_MSVC
  #include <conio.h>
  #endif

Index: sleep.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/sleep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sleep.cpp	29 Mar 2004 09:52:31 -0000	1.3
--- sleep.cpp	2 Aug 2004 10:24:06 -0000	1.4
***************
*** 7,11 ****
    Sleep (msec);
  }
! #elif defined(COMP_GCC) && defined(OS_WIN32)
  void psSleep (unsigned long msec)
  {
--- 7,11 ----
    Sleep (msec);
  }
! #elif defined(CS_COMPILER_GCC) && defined(CS_PLATFORM_WIN32)
  void psSleep (unsigned long msec)
  {