[Rtk-cvs] rtk/rtk rchar.h,1.12,1.13 rchar_ascii.h,1.7,1.8 rchar_unicode.h,1.7,1.8

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

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

Modified Files:
	rchar.h rchar_ascii.h rchar_unicode.h 
Log Message:
Started porting to Symbian

Index: rchar.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rchar.h	29 Feb 2004 20:53:25 -0000	1.12
--- rchar.h	10 Mar 2004 12:01:12 -0000	1.13
***************
*** 7,14 ****
  #include <stdio.h>
  #include <string.h>
- #include <wchar.h>
- #include <wctype.h>
  #include <stdarg.h>
  
  namespace Rtk {
  
--- 7,17 ----
  #include <stdio.h>
  #include <string.h>
  #include <stdarg.h>
  
+ #ifndef __EPOC32__
+ #  include <wchar.h>
+ #  include <wctype.h>
+ #endif
+ 
  namespace Rtk {
  

Index: rchar_ascii.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar_ascii.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rchar_ascii.h	29 Feb 2004 20:53:25 -0000	1.7
--- rchar_ascii.h	10 Mar 2004 12:01:12 -0000	1.8
***************
*** 6,9 ****
--- 6,10 ----
  #include <time.h>
  #include <ctype.h>
+ #include <stdio.h>
  
  #define RCHAR char
***************
*** 49,52 ****
--- 50,59 ----
  #define		rvprintf		vprintf
  
+ #if __EPOC32__
+ // Symbian doesnt has any *nprintf function!!
+ #  define vsnprintf(str,size,fmt,args) vsprintf(str,fmt,args)
+ #  define snprintf(str,size,fmt,args...) sprintf(str,fmt,#args)
+ #endif
+ 
  // scanf's
  #define		rfscanf			fscanf

Index: rchar_unicode.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rchar_unicode.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rchar_unicode.h	29 Feb 2004 21:27:34 -0000	1.7
--- rchar_unicode.h	10 Mar 2004 12:01:12 -0000	1.8
***************
*** 4,9 ****
  
  // using 16 bit (usually) unicode characters
! #include <wctype.h>
! #include <wchar.h>
  #include <time.h>
  
--- 4,13 ----
  
  // using 16 bit (usually) unicode characters
! 
! #ifndef __EPOC32__ // Symbian has some special sort of std lib
! #  include <wctype.h>
! #  include <wchar.h>
! #endif
! 
  #include <time.h>