From d027cd3275fd72fe4fefc0b0607e54701632d834 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Thu, 16 Apr 2009 19:29:16 +0000
Subject: [PATCH] 2009-04-16 21:36 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/include/hbrdddbf.h   *
 harbour/include/hbrddnsx.h   * harbour/include/hbdbsort.h   *
 harbour/include/hbrddcdx.h   * harbour/include/hbrddfpt.h   *
 harbour/include/hbrddntx.h   * harbour/source/rdd/dbf1.c     * simplified
 some internal DBFRDD macros/declaration

---
 harbour/ChangeLog          | 10 ++++++++++
 harbour/include/hbdbsort.h |  1 -
 harbour/include/hbrddcdx.h |  3 ---
 harbour/include/hbrdddbf.h |  4 ++--
 harbour/include/hbrddfpt.h |  4 ----
 harbour/include/hbrddnsx.h |  1 -
 harbour/include/hbrddntx.h |  3 ---
 harbour/source/rdd/dbf1.c  | 11 +++++------
 8 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cc73be1b4b..f18fe05ebc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-16 21:36 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbrdddbf.h
+  * harbour/include/hbrddnsx.h
+  * harbour/include/hbdbsort.h
+  * harbour/include/hbrddcdx.h
+  * harbour/include/hbrddfpt.h
+  * harbour/include/hbrddntx.h
+  * harbour/source/rdd/dbf1.c
+    * simplified some internal DBFRDD macros/declaration
+
 2009-04-16 17:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/garbage.c
     + added optional support for automatic GC activation.
diff --git a/harbour/include/hbdbsort.h b/harbour/include/hbdbsort.h
index bb422dc3a6..afb27cf004 100644
--- a/harbour/include/hbdbsort.h
+++ b/harbour/include/hbdbsort.h
@@ -53,7 +53,6 @@
 #ifndef HB_DBSORT_H_
 #define HB_DBSORT_H_
 
-#define HB_EXTERNAL_RDDDBF_USE
 #include "hbrdddbf.h"
 
 HB_EXTERN_BEGIN
diff --git a/harbour/include/hbrddcdx.h b/harbour/include/hbrddcdx.h
index 6ff7eb09b5..e3f4fdfff5 100644
--- a/harbour/include/hbrddcdx.h
+++ b/harbour/include/hbrddcdx.h
@@ -53,9 +53,6 @@
 #ifndef HB_RDDCDX_H_
 #define HB_RDDCDX_H_
 
-#include "hbapirdd.h"
-#include "hbdbferr.h"
-#define HB_EXTERNAL_RDDDBF_USE
 #include "hbrdddbf.h"
 
 HB_EXTERN_BEGIN
diff --git a/harbour/include/hbrdddbf.h b/harbour/include/hbrdddbf.h
index 38da08e212..72767e2ab7 100644
--- a/harbour/include/hbrdddbf.h
+++ b/harbour/include/hbrdddbf.h
@@ -250,7 +250,7 @@ typedef DBFAREA * LPDBFAREA;
 #define DBFAREAP LPDBFAREA
 #endif
 
-#ifndef HB_EXTERNAL_RDDDBF_USE
+#ifdef _HB_RDDDBF_INTERNAL_
 
 /*
  * -- DBF METHODS --
@@ -361,7 +361,7 @@ static HB_ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect
 
 #define hb_dbfWhoCares                             NULL
 
-#endif /* HB_EXTERNAL_RDDDBF_USE */
+#endif /* _HB_RDDDBF_INTERNAL_ */
 
 extern HB_EXPORT ULONG      hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex );
 extern HB_EXPORT void       hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex,
diff --git a/harbour/include/hbrddfpt.h b/harbour/include/hbrddfpt.h
index bf7c1bbe94..a84f4dc754 100644
--- a/harbour/include/hbrddfpt.h
+++ b/harbour/include/hbrddfpt.h
@@ -53,10 +53,6 @@
 #ifndef HB_RDDFPT_H_
 #define HB_RDDFPT_H_
 
-#include "hbdbf.h"
-#include "hbdbferr.h"
-#include "hbapirdd.h"
-#define HB_EXTERNAL_RDDDBF_USE
 #include "hbrdddbf.h"
 
 HB_EXTERN_BEGIN
diff --git a/harbour/include/hbrddnsx.h b/harbour/include/hbrddnsx.h
index 5981506871..7a58671e4e 100644
--- a/harbour/include/hbrddnsx.h
+++ b/harbour/include/hbrddnsx.h
@@ -176,7 +176,6 @@ LEAF KEY COMPRESSION:
 #ifndef HB_RDDNSX_H_
 #define HB_RDDNSX_H_
 
-#define HB_EXTERNAL_RDDDBF_USE
 #include "hbrdddbf.h"
 
 HB_EXTERN_BEGIN
diff --git a/harbour/include/hbrddntx.h b/harbour/include/hbrddntx.h
index 8f3ec972d2..bdfba0c032 100644
--- a/harbour/include/hbrddntx.h
+++ b/harbour/include/hbrddntx.h
@@ -53,9 +53,6 @@
 #ifndef HB_RDDNTX_H_
 #define HB_RDDNTX_H_
 
-#include "hbapirdd.h"
-#include "hbdbferr.h"
-#define HB_EXTERNAL_RDDDBF_USE
 #include "hbrdddbf.h"
 
 HB_EXTERN_BEGIN
diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c
index d15b41a094..d3ff651ac1 100644
--- a/harbour/source/rdd/dbf1.c
+++ b/harbour/source/rdd/dbf1.c
@@ -52,20 +52,19 @@
 
 #define HB_TRIGVAR_BYREF
 
-#include "hbapi.h"
-#include "hbinit.h"
-#include "hbvm.h"
-#include "hbapiitm.h"
+#define _HB_RDDDBF_INTERNAL_
+
 #include "hbrdddbf.h"
-#include "hbdbf.h"
+#include "hbdbsort.h"
+#include "hbapiitm.h"
 #include "hbapierr.h"
 #include "hbapilng.h"
 #include "hbset.h"
 #include "hbdate.h"
 #include "hbmath.h"
-#include "hbdbsort.h"
 #include "hbsxfunc.h"
 #include "hbstack.h"
+#include "hbvm.h"
 #include "error.ch"
 #include "rddsys.ch"
 #include "hbsxdef.ch"