[Rtk-cvs] rtk/rtk conf.h,1.9,1.10

[<de...@us...>]

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

Modified Files:
	conf.h 
Log Message:
Small CVS conflict resolved.

Index: conf.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/conf.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** conf.h	5 Mar 2004 18:30:58 -0000	1.9
--- conf.h	8 Mar 2004 08:28:50 -0000	1.10
***************
*** 59,63 ****
  
  // Define this, if the platform uses UNICODE
! //#define UNICODE 1
  
  #if defined(_RTK_WIN32_)
--- 59,69 ----
  
  // Define this, if the platform uses UNICODE
! // RTK_BC_UNICODE is (like all *_BC_* macros) set by CMake/autotools
! #define RTK_UNICODE 1
! #if (RTK_UNICODE == 1)
! # define UNICODE 1
! #else
! # undef UNICODE
! #endif
  
  #if defined(_RTK_WIN32_)
***************
*** 86,87 ****
--- 92,97 ----
  
  #endif // __RTK_CONFIG_H__
+ 
+ /**
+   * $Id$
+   ***************************************************************************/