[Rtk-cvs] rtk/rtk rchar_ascii.h,1.3,1.4 rchar.h,1.9,1.10

[<sp...@us...>]

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

Modified Files:
	rchar_ascii.h rchar.h 
Log Message:
Minor fixes (eg namespace)

Index: rchar_ascii.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar_ascii.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rchar_ascii.h	23 Feb 2004 20:16:43 -0000	1.3
--- rchar_ascii.h	26 Feb 2004 20:02:16 -0000	1.4
***************
*** 1,8 ****
! #ifndef INCLUDE_FROM_RCHAR
  #  error "This file must be included from rchar.h"
  #endif
  
  // using 8 bit ASCII characters
! #include <time.h> 
  
  #define RCHAR char
--- 1,9 ----
! #ifndef INCLUDED_FROM_RCHAR
  #  error "This file must be included from rchar.h"
  #endif
  
  // using 8 bit ASCII characters
! #include <time.h>
! #include <ctype.h>
  
  #define RCHAR char
***************
*** 55,58 ****
--- 56,62 ----
  #define		rsscanf			sscanf
  #define		rscanf			scanf
+ #define		rvfscanf		vfscanf
+ #define		rvsscanf		vsscanf
+ #define		rvscanf			vscanf
  
  // File
***************
*** 86,90 ****
  
  // is*
! #define		risascii		iswascii
  #define		riscntrl		iswcntrl
  #define		risgraph		iswgraph
--- 90,94 ----
  
  // is*
! #define		risascii		isascii
  #define		riscntrl		iswcntrl
  #define		risgraph		iswgraph

Index: rchar.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rchar.h	23 Feb 2004 20:16:43 -0000	1.9
--- rchar.h	26 Feb 2004 20:02:16 -0000	1.10
***************
*** 10,13 ****
--- 10,15 ----
  #include <stdarg.h>
  
+ namespace Rtk {
+ 
  /*****************************************************************************
  		RCHAR - 8 bit or 16 bit character
***************
*** 25,27 ****
--- 27,31 ----
  RCHAR* rstrupr(const RCHAR* str);
  
+ } // namespace Rtk
+ 
  #endif /* _RTK_RCHAR_H_ */