From d2d3e749527c0149b80da79d96044256e46628f4 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 30 Jan 2013 08:37:34 +0000
Subject: [PATCH] 2013-01-30 09:35 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/codepage/cpcs852.c   * src/codepage/cpsk852.c     + converted to
 UTF8. Also avoiding OS X/clang to hang

  * src/codepage/cpplmaz.c
    * 'svn propset svn:mime-type "text/plain; charset=UTF-8"'

  * src/rtl/cdpapi.c
    * spaces
---
 harbour/ChangeLog.txt          | 11 +++++++++++
 harbour/src/codepage/cpcs852.c |  5 +++--
 harbour/src/codepage/cpsk852.c |  5 +++--
 harbour/src/rtl/cdpapi.c       |  4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index e437f87353..f41302f427 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-01-30 09:35 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * src/codepage/cpcs852.c
+  * src/codepage/cpsk852.c
+    + converted to UTF8. Also avoiding OS X/clang to hang
+
+  * src/codepage/cpplmaz.c
+    * 'svn propset svn:mime-type "text/plain; charset=UTF-8"'
+
+  * src/rtl/cdpapi.c
+    * spaces
+
 2013-01-30 09:21 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/codepage/cpcs852.c
   * src/codepage/cpsk852.c
diff --git a/harbour/src/codepage/cpcs852.c b/harbour/src/codepage/cpcs852.c
index b6c601509b..c27b8c8a66 100644
--- a/harbour/src/codepage/cpcs852.c
+++ b/harbour/src/codepage/cpcs852.c
@@ -55,8 +55,9 @@
 #define HB_CP_INFO      "Czech CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A��BC�D�E���FGH.CH.I�JKLMN�O��PQR�S�T�U�ޚVWXY�Z�"
-#define HB_CP_LOWER     "a��bc�d�e�؉fgh.ch.i�jklmn�o��pqr�s�t�u���vwxy�z�"
+#define HB_CP_UPPER     "AÁÄBCČDĎEÉĚËFGH.CH.IÍJKLMNŇOÓÖPQRŘSŠTŤUÚŮÜVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdďeéěëfgh.ch.iíjklmnňoóöpqrřsštťuúůüvwxyýzž"
+#define HB_CP_UTF8
 
 /* include CP registration code */
 #include "hbcdpreg.h"
diff --git a/harbour/src/codepage/cpsk852.c b/harbour/src/codepage/cpsk852.c
index b5bc14abc3..a2b487751c 100644
--- a/harbour/src/codepage/cpsk852.c
+++ b/harbour/src/codepage/cpsk852.c
@@ -16,8 +16,9 @@
 #define HB_CP_INFO      "Slovak CP-852"
 #define HB_CP_UNITB     HB_UNITB_852
 #define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
-#define HB_CP_UPPER     "A��BC�D�.DZ..D�.E���FGH.CH.I�JKL��MN�O�♊PQR��S�T�U�ޚ�VWXY�Z�"
-#define HB_CP_LOWER     "a��bc�d�.dz..d�.e�؉fgh.ch.i�jkl��mn�o����pqr��s�t�u����vwxy�z�"
+#define HB_CP_UPPER     "AÁÄBCČDĎ.DZ..DŽ.EÉĚËFGH.CH.IÍJKLĹĽMNŇOÓÔÖŐPQRŔŘSŠTŤUÚŮÜŰVWXYÝZŽ"
+#define HB_CP_LOWER     "aáäbcčdď.dz..dž.eéěëfgh.ch.iíjklĺľmnňoóôöőpqrŕřsštťuúůüűvwxyýzž"
+#define HB_CP_UTF8
 
 /* include CP registration code */
 #include "hbcdpreg.h"
diff --git a/harbour/src/rtl/cdpapi.c b/harbour/src/rtl/cdpapi.c
index 5fc36f320b..398848dac3 100644
--- a/harbour/src/rtl/cdpapi.c
+++ b/harbour/src/rtl/cdpapi.c
@@ -2637,8 +2637,8 @@ static HB_UCHAR hb_cdpUtf8Char( const char ** pStrPtr, PHB_UNITABLE uniTable )
    return uc;
 }
 
-#define _HB_CDP_GETUC( p )  ( !fUtf8 ? ( HB_UCHAR ) (*(p) ? *(p)++ : *(p)) \
-                                     : hb_cdpUtf8Char( &(p), uniTable ) )
+#define _HB_CDP_GETUC( p )  ( ! fUtf8 ? ( HB_UCHAR ) ( *( p ) ? *( p )++ : *( p ) ) \
+                                      : hb_cdpUtf8Char( &( p ), uniTable ) )
 
 static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
                                       PHB_UNITABLE uniTable,