[Rtk-cvs] rtk/rtk Thread.h,1.4,1.5 conf.h,1.8,1.9

[<le...@us...>]

Update of /cvsroot/rtk/rtk/rtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31386

Modified Files:
	Thread.h conf.h 
Log Message:
Some small changes, mostly related to Thread implementation.


Index: Thread.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/Thread.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Thread.h	21 Feb 2004 11:24:27 -0000	1.4
--- Thread.h	5 Mar 2004 18:30:58 -0000	1.5
***************
*** 91,102 ****
      virtual int ThreadStep() { return 0; }
  
  private:
!     bool _running;
  
      ThreadFunction _function;
  
!     void *_arg;
!     void *_thread_handle;
! 	unsigned long _thread_id;
  
  	friend void *thread_function(void *arg);
--- 91,107 ----
      virtual int ThreadStep() { return 0; }
  
+     // sleep time between single_steps
+     void ms_sleep(int sleep) { _ms_sleep = sleep; }
+     int ms_sleep()			 { return _ms_sleep;  }
+ 
  private:
!     bool _running, _kill_thread;
  
      ThreadFunction _function;
  
!     void*          _arg;
!     void*          _thread_handle;
! 	unsigned long  _thread_id;
! 	unsigned int   _ms_sleep;
  
  	friend void *thread_function(void *arg);

Index: conf.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/conf.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** conf.h	2 Mar 2004 11:26:22 -0000	1.8
--- conf.h	5 Mar 2004 18:30:58 -0000	1.9
***************
*** 2,17 ****
  #define __RTK_CONFIG_H__ 1
  
- // --- RTK BUILD CONFIG (automatic) definitions
- #define RTK_BC_HAVE_WCSCMP 1
  
! // Define macros for i18n
! // Will be moved to Translation.h or Locale.h or ..
! // _TR	- Translate text 
! #define _TR(x) x
! // _NOP - Notify translation parser for string to translate. Used in static RCHAR arrays
! #define _NOP(x) x
  
  #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
  # 	define _RTK_WIN32_ 1
  #endif
  
--- 2,59 ----
  #define __RTK_CONFIG_H__ 1
  
  
! /*************************************************************************
!  * Platform and compiler support detection
!  */
! #if defined(__GNUC__)
! #	define _RTK_CC_GCC_
! #elif defined(__SUNPRO_C)
! #	define _RTK_CC_SUNPRO_
! #elif defined(__SUNPRO_CC)
! #	define _RTK_CC_SUNPRO_
! #	define __SUNPRO_C __SUNPRO_CC
! #elif defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)
! #	define _RTK_CC_XLC_
! #elif defined(_AIX) && !defined(__GNUC__)
! #	define _RTK_CC_XLC_ /* Workaround for old xlc */
! #elif defined(__DECC) || defined(__DECCXX)
! #	define _RTK_CC_DECC_
! #elif defined(__osf__) && defined(__LANGUAGE_C__)
! #	define _RTK_CC_DECC_ /* Workaround for old DEC C compilers */
! #elif defined(_MSC_VER)
! #	define _RTK_CC_MSVC_
! #elif defined(__BORLANDC__)
! #	define _RTK_CC_BCB_
! #endif
! 
! /*************************************************************************
!  * Detect whether we support inline
!  */
! #if defined(__cplusplus)
! #	define RTK_INLINE inline
! #elif defined(RTK_CC_GCC)
! #	define RTK_INLINE __inline__
! #elif defined(TRIO_CC_MSVC)
! #	define RTK_INLINE _inline
! #elif defined(TRIO_CC_BCB)
! #	define RTK_INLINE __inline
! #else
! #	define RTK_INLINE
! #endif
  
  #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
  # 	define _RTK_WIN32_ 1
+ #else
+ # 	define _RTK_LINUX_ 1
+ #endif
+ 
+ #if defined(_WIN32_WCE)
+ #	define _RTK_WINCE_ 1
+ #endif
+ 
+ // Prevent Visual C++ 6.0 from printing out stupid warnings
+ #if defined(_RTK_CC_MSVC_) && (_MSC_VER >= 600)
+ # pragma warning(disable: 4550)
+ # pragma warning(disable: 4244)
  #endif
  
***************
*** 19,33 ****
  //#define UNICODE 1
  
! #if defined(UNICODE)
  // Be sure that _UNICODE is also defined (but only on Win32!)
- #  if defined(_RTK_WIN32_)
  #    define _UNICODE 1
- #  else
- #    undef _UNICODE
- #  endif
  #else
! // Multibyte defined
! //#  define MBCS 1
! //#  define _MBCS 1
  #endif
  
--- 61,81 ----
  //#define UNICODE 1
  
! #if defined(_RTK_WIN32_)
! // UNICODE is default WIN32, but not must
! #	define UNICODE 1
! #endif
! 
! #if defined(_RTK_WINCE_) && !defined(UNICODE)
! // UNICODE is MUST under WinCE
! #	define UNICODE 1
! #endif
! 
! #if defined(UNICODE) && defined(_RTK_WIN32_) && !defined(_UNICODE)
  // Be sure that _UNICODE is also defined (but only on Win32!)
  #    define _UNICODE 1
  #else
! // Singlebyte defined (ASCII)
! #  define SBCS 1
! #  define _SBCS 1
  #endif
  
***************
*** 38,43 ****
  
  #endif // __RTK_CONFIG_H__
- 
- /**
-   * $Id$
-   ***************************************************************************/
\ No newline at end of file
--- 86,87 ----