[Cppunit-cvs] cppunit2/include/cpptl atomiccounter.h,1.6,1.7 config.h,1.15,1.16

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

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

Modified Files:
	atomiccounter.h config.h 
Log Message:
* added pthread api activation
* added CPPTL_USE_WIN32_ATOMIC for WIN32

Index: config.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/config.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** config.h	6 Mar 2005 20:12:31 -0000	1.15
--- config.h	6 Mar 2005 21:12:39 -0000	1.16
***************
*** 65,68 ****
--- 65,69 ----
  
  # if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ #  define CPPTL_USE_WIN32_ATOMIC 1
  #  define CPPTL_USE_WIN32_THREAD 1
  # elif defined(linux) || defined(__linux) || defined(__linux__)
***************
*** 129,133 ****
  
  # if !defined(CPPTL_HAS_THREAD)
! #  if CPPTL_USE_WIN32_THREAD
  #   define CPPTL_HAS_THREAD 1
  #  endif
--- 130,134 ----
  
  # if !defined(CPPTL_HAS_THREAD)
! #  if CPPTL_USE_WIN32_THREAD || CPPTL_USE_PTHREAD_THREAD
  #   define CPPTL_HAS_THREAD 1
  #  endif

Index: atomiccounter.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/atomiccounter.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** atomiccounter.h	6 Mar 2005 20:28:41 -0000	1.6
--- atomiccounter.h	6 Mar 2005 21:12:38 -0000	1.7
***************
*** 12,21 ****
  // http://publib.boulder.ibm.com/infocenter/pseries/index.jsp?topic=/com.ibm.vacpp7a.doc/compiler/ref/rubifunc.htm
  
! # ifdef WIN32 // Forwards declaration for WIN32 (avoid including windows.h)
  
  extern "C" __declspec(dllimport) long __stdcall InterlockedIncrement(long volatile *);
  extern "C" __declspec(dllimport) long __stdcall InterlockedDecrement(long volatile *);
   
! # endif // ifdef WIN32
  
  
--- 12,21 ----
  // http://publib.boulder.ibm.com/infocenter/pseries/index.jsp?topic=/com.ibm.vacpp7a.doc/compiler/ref/rubifunc.htm
  
! # if CPPTL_USE_WIN32_ATOMIC // Forwards declaration for WIN32 (avoid including windows.h)
  
  extern "C" __declspec(dllimport) long __stdcall InterlockedIncrement(long volatile *);
  extern "C" __declspec(dllimport) long __stdcall InterlockedDecrement(long volatile *);
   
! # endif // ifdef CPPTL_USE_WIN32_ATOMIC
  
  
***************
*** 61,65 ****
  // //////////////////////////////////////////////////////////////////
  // //////////////////////////////////////////////////////////////////
! # ifdef WIN32
  
  inline 
--- 61,65 ----
  // //////////////////////////////////////////////////////////////////
  // //////////////////////////////////////////////////////////////////
! # if CPPTL_USE_WIN32_ATOMIC
  
  inline 
***************
*** 209,213 ****
  }
  
! # endif // ifdef WIN32
  
  
--- 209,213 ----
  }
  
! # endif // ifdef CPPTL_USE_WIN32_ATOMIC