[Rtk-cvs] rtk/src/core Dict.cpp,1.8,1.9 String.cpp,1.4,1.5 call_main.c,1.3,1.4 debug.cpp,1.2,1.3

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

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

Modified Files:
	Dict.cpp String.cpp call_main.c debug.cpp 
Log Message:
Some minor changes in order to compile on symbian (I will check if it still compiles in linux in a moment)

Index: Dict.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/src/core/Dict.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Dict.cpp	7 Mar 2004 20:53:00 -0000	1.8
--- Dict.cpp	10 Mar 2004 12:22:07 -0000	1.9
***************
*** 46,54 ****
  #endif
  
  #include <stdlib.h>
  #include <assert.h>
  
- #include <rtk/Dict.h>
- #include <rtk/String.h>
  
  // package also
--- 46,55 ----
  #endif
  
+ #include <rtk/Dict.h>
+ #include <rtk/String.h>
+ 
  #include <stdlib.h>
  #include <assert.h>
  
  
  // package also

Index: String.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/src/core/String.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** String.cpp	8 Mar 2004 19:55:24 -0000	1.4
--- String.cpp	10 Mar 2004 12:22:07 -0000	1.5
***************
*** 1,5 ****
! #include <wctype.h>
  #include <string.h>
- #include <wchar.h>
  #include <stdarg.h>
  
--- 1,5 ----
! #include <rtk/String.h>
! 
  #include <string.h>
  #include <stdarg.h>
  
***************
*** 8,16 ****
  #include <stdlib.h>
  
- #include <rtk/String.h>
  
  namespace Rtk {
  
  String String::NullString;
  
  #define DATASIZE(x) ( (x)*sizeof(RCHAR) )
--- 8,17 ----
  #include <stdlib.h>
  
  
  namespace Rtk {
  
+ #ifndef __EPOC32__ // No initialized data in symbian
  String String::NullString;
+ #endif
  
  #define DATASIZE(x) ( (x)*sizeof(RCHAR) )

Index: call_main.c
===================================================================
RCS file: /cvsroot/rtk/rtk/src/core/call_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** call_main.c	22 Feb 2004 13:17:32 -0000	1.3
--- call_main.c	10 Mar 2004 12:22:08 -0000	1.4
***************
*** 62,65 ****
--- 62,67 ----
   */
  
+ /* Pali: Shouldn't this file be in platform/win32/ ? */
+ 
  #include <rtk/conf.h>
  

Index: debug.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/src/core/debug.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debug.cpp	18 Jan 2004 20:17:07 -0000	1.2
--- debug.cpp	10 Mar 2004 12:22:08 -0000	1.3
***************
*** 1,2 ****
--- 1,4 ----
+ #include <time.h>
+ 
  #include <rtk/debug.h>
  #include <rtk/error.h>
***************
*** 6,12 ****
--- 8,20 ----
  namespace Rtk {
  
+ #ifndef __EPOC32__
  static debug_cb_t *cbs = 0;
  static int cb_count = 0;
  static int cb_size = 0;
+ #else
+ debug_cb_t *cbs;
+ int cb_count;
+ int cb_size;
+ #endif
  
  ERROR_RET debug_add_cb(debug_cb_t cb)