[Cppunit-cvs] cppunit/include/cppunit Portability.h,1.25,1.26

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit/include/cppunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18167/include/cppunit

Modified Files:
	Portability.h 
Log Message:
* include/cppunit/Portability.h: fixed EVC++ 4 detection.

Index: Portability.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/include/cppunit/Portability.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Portability.h	25 Jun 2004 10:41:27 -0000	1.25
--- Portability.h	6 Nov 2004 10:42:01 -0000	1.26
***************
*** 8,16 ****
  /* include platform specific config */
  #if defined(__BORLANDC__)
! #    include <cppunit/config/config-bcb5.h>
! #elif defined( EVC4 )
! #    include <cppunit/config/config-evc4.h>
  #elif defined (_MSC_VER)
  #    include <cppunit/config/config-msvc6.h>
  #else
  #    include <cppunit/config-auto.h>
--- 8,18 ----
  /* include platform specific config */
  #if defined(__BORLANDC__)
! #  include <cppunit/config/config-bcb5.h>
  #elif defined (_MSC_VER)
+ #  if _MSC_VER == 1200 && defined(_WIN32_WCE) //evc4
+ #    include <cppunit/config/config-evc4.h>
+ #  else
  #    include <cppunit/config/config-msvc6.h>
+ #  endif
  #else
  #    include <cppunit/config-auto.h>
***************
*** 19,23 ****
  // Version number of package
  #ifndef CPPUNIT_VERSION 
! #define CPPUNIT_VERSION  "1.10.2"
  #endif
   
--- 21,25 ----
  // Version number of package
  #ifndef CPPUNIT_VERSION 
! #define CPPUNIT_VERSION  "1.10.4"
  #endif