From d0c085ee976dde0c93bb57d5e2275bd2a066dc27 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 3 Feb 2009 13:48:59 +0000
Subject: [PATCH] 2009-02-03 14:48 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * include/hbusrrdd.ch   * include/hbapi.h     + Added HB_SUCCESS,
 HB_FAILURE on .prg level, too.     * SUCCESS, FAILURE, ERRCODE as
 compatibility.     * Minor cleanup.

  ; TODO: Switch to HB_* versions inside Harbour tree.
---
 harbour/ChangeLog           | 15 ++++++++++++---
 harbour/include/hbapi.h     |  9 +++++----
 harbour/include/hbusrrdd.ch | 34 +++++++++++++++++++---------------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 43a15468ed..36cef669f4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-03 14:48 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * include/hbusrrdd.ch
+  * include/hbapi.h
+    + Added HB_SUCCESS, HB_FAILURE on .prg level, too.
+    * SUCCESS, FAILURE, ERRCODE as compatibility.
+    * Minor cleanup.
+
+  ; TODO: Switch to HB_* versions inside Harbour tree.
+
 2009-02-03 14:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/doc/Makefile
   * harbour/doc/es/Makefile
@@ -956,8 +965,8 @@
            XML database (empty boxes in Chrome, empty boxes
            and error messagebox with IE8)
            doesn't work here.
-
            Shall I configure something?
+           [SOLVED]
 
 2009-01-27 00:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/examples/uhttpd/uhttpd.prg
@@ -1036,7 +1045,7 @@
       Still doesn't compile however.
       I'll rather disable this code for now, unless someone jumps
       in an fixes these problems.
-    ; TOFIX: For MSVC, too:
+    ; TOFIX: For MSVC, too: [DONE]
       source\common\hbprintf.c(213) : error C2061: syntax error : identifier 'intmax_t'
       source\common\hbprintf.c(214) : error C2061: syntax error : identifier 'as_x_uintmax_t'
       source\common\hbprintf.c(214) : error C2059: syntax error : ';'
@@ -2055,7 +2064,7 @@
              play well with server side apps (as the app may run for
              months or even longer), and even worse, they
              will lock the passed directory so that they cannot be
-             removed (maybe even renamed), until the app exists.
+             removed (maybe even renamed), until the app exits.
              At least on Windows.
 
   * source/rtl/dirdrive.c
diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h
index 1c6516babb..5cd55e60b3 100644
--- a/harbour/include/hbapi.h
+++ b/harbour/include/hbapi.h
@@ -440,14 +440,15 @@ typedef struct _HB_NESTED_CLONED
 
 
 /* RDD method return codes */
-typedef USHORT ERRCODE;
-#define SUCCESS            0
-#define FAILURE            1
-
 typedef USHORT HB_ERRCODE;
 #define HB_SUCCESS         0
 #define HB_FAILURE         1
 
+/* Compatibility #defines */
+#define ERRCODE            HB_ERRCODE
+#define SUCCESS            HB_SUCCESS
+#define FAILURE            HB_FAILURE
+
 extern HB_SYMB  hb_symEval;
 
 typedef ULONG HB_VMHANDLE;
diff --git a/harbour/include/hbusrrdd.ch b/harbour/include/hbusrrdd.ch
index 0ba33eee38..54cb394e98 100644
--- a/harbour/include/hbusrrdd.ch
+++ b/harbour/include/hbusrrdd.ch
@@ -203,23 +203,23 @@
 #endif
 
 /* Flags for DBTRANSINFO */
-#define DBTF_MATCH         0x0001
-#define DBTF_PUTREC        0x0002
+#define DBTF_MATCH            0x0001
+#define DBTF_PUTREC           0x0002
 
 /* Codes for Locking methods */
-#define DBLM_EXCLUSIVE     1
-#define DBLM_MULTIPLE      2
-#define DBLM_FILE          3
+#define DBLM_EXCLUSIVE        1
+#define DBLM_MULTIPLE         2
+#define DBLM_FILE             3
 
 /* Codes for RawLock types */
-#define FILE_LOCK          1
-#define FILE_UNLOCK        2
-#define REC_LOCK           3
-#define REC_UNLOCK         4
-#define HEADER_LOCK        5
-#define HEADER_UNLOCK      6
-#define APPEND_LOCK        7
-#define APPEND_UNLOCK      8
+#define FILE_LOCK             1
+#define FILE_UNLOCK           2
+#define REC_LOCK              3
+#define REC_UNLOCK            4
+#define HEADER_LOCK           5
+#define HEADER_UNLOCK         6
+#define APPEND_LOCK           7
+#define APPEND_UNLOCK         8
 
 
 /* DBOPENINFO */
@@ -356,5 +356,9 @@
 #define UR_ORCR_SIZE          7
 
 
-#define SUCCESS   0
-#define FAILURE   1
+#define HB_SUCCESS            0
+#define HB_FAILURE            1
+
+/* Compatibility #defines */
+#define SUCCESS               HB_SUCCESS
+#define FAILURE               HB_FAILURE