From d612e8b3cec492dbd2e7250314e346184f9ee1e0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 4 Aug 2010 09:45:21 +0000
Subject: [PATCH] 2010-08-03 11:40 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * include/hbextudd.ch   * include/hbextsca.ch   *
 include/hbextern.ch   * config/postinst.hbs     ! Fixed to exclude HB_GT_
 symbols, put HBSYMBOL to hbextsca.ch,       put USRRDD_* to hbextudd.ch.

    ; NOTE: May I ask to review the new headers compared to old
            one to see what else have to be filtered out or moved
            to different header?
---
 harbour/ChangeLog           | 12 ++++++++++++
 harbour/config/postinst.hbs |  8 +++++---
 harbour/include/hbextern.ch | 18 ------------------
 harbour/include/hbextsca.ch |  1 +
 harbour/include/hbextudd.ch | 10 ++++++++++
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fbdc0e6863..6fa334719d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-03 11:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbextudd.ch
+  * include/hbextsca.ch
+  * include/hbextern.ch
+  * config/postinst.hbs
+    ! Fixed to exclude HB_GT_ symbols, put HBSYMBOL to hbextsca.ch,
+      put USRRDD_* to hbextudd.ch.
+
+    ; NOTE: May I ask to review the new headers compared to old
+            one to see what else have to be filtered out or moved
+            to different header?
+
 2010-08-03 11:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbrun/hbrun.prg
     + Will now add the script's home directory to the header dir list.
diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs
index cd6128c7d5..81d9deaf3c 100644
--- a/harbour/config/postinst.hbs
+++ b/harbour/config/postinst.hbs
@@ -556,11 +556,13 @@ STATIC FUNCTION mk_extern_core()
 
          FOR EACH tmp IN aExtern
             DO CASE
-            CASE "|" + tmp $ "|HBARRAY|HBBLOCK|HBCHARACTER|HBDATE|HBTIMESTAMP|HBLOGICAL|HBNIL|HBNUMERIC" ; AAdd( aSCALAR, tmp )
+            CASE "|" + tmp $ "|HBARRAY|HBBLOCK|HBCHARACTER|HBDATE|HBTIMESTAMP|HBLOGICAL|HBNIL|HBNUMERIC|HBSYMBOL" ; AAdd( aSCALAR, tmp )
             CASE Left( tmp, Len( "HB_CODEPAGE_" ) ) == "HB_CODEPAGE_" ; AAdd( aCODEPAGE, tmp )
             CASE Left( tmp, Len( "HB_LANG_"     ) ) == "HB_LANG_"     ; AAdd( aLANG    , tmp )
-            CASE Left( tmp, Len( "UR_SUPER_"    ) ) == "UR_SUPER_"    ; AAdd( aUSRRDD  , tmp )
-            OTHERWISE                                                 ; AAdd( aMain    , tmp )
+            CASE Left( tmp, Len( "UR_SUPER_"    ) ) == "UR_SUPER_" .OR. ;
+                 Left( tmp, Len( "USRRDD_"      ) ) == "USRRDD_"      ; AAdd( aUSRRDD  , tmp )
+            CASE !( Left( tmp, Len( "HB_GT_" ) ) == "HB_GT_" )        ; AAdd( aMain    , tmp )
+            OTHERWISE
             ENDCASE
          NEXT
 
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index b67b42da54..7cba02c42b 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -258,7 +258,6 @@ EXTERNAL HBRADIOGROUP
 EXTERNAL HBREPORTFORM
 EXTERNAL HBSCALAR
 EXTERNAL HBSCROLLBAR
-EXTERNAL HBSYMBOL
 EXTERNAL HBTEXTLINE
 EXTERNAL HBTOPBARMENU
 EXTERNAL HB_ADEL
@@ -416,13 +415,6 @@ EXTERNAL HB_GTSELECT
 EXTERNAL HB_GTSYS
 EXTERNAL HB_GTUNLOCK
 EXTERNAL HB_GTVERSION
-EXTERNAL HB_GT_CGI
-EXTERNAL HB_GT_GUI
-EXTERNAL HB_GT_NUL
-EXTERNAL HB_GT_PCA
-EXTERNAL HB_GT_STD
-EXTERNAL HB_GT_WIN
-EXTERNAL HB_GT_WVT
 EXTERNAL HB_GZCLEARERR
 EXTERNAL HB_GZCLOSE
 EXTERNAL HB_GZDIRECT
@@ -1115,16 +1107,6 @@ EXTERNAL TYPE
 EXTERNAL UPDATED
 EXTERNAL UPPER
 EXTERNAL USED
-EXTERNAL USRRDD_AREADATA
-EXTERNAL USRRDD_AREARESULT
-EXTERNAL USRRDD_GETFUNCTABLE
-EXTERNAL USRRDD_ID
-EXTERNAL USRRDD_RDDDATA
-EXTERNAL USRRDD_SETBOF
-EXTERNAL USRRDD_SETBOTTOM
-EXTERNAL USRRDD_SETEOF
-EXTERNAL USRRDD_SETFOUND
-EXTERNAL USRRDD_SETTOP
 EXTERNAL VAL
 EXTERNAL VALTYPE
 EXTERNAL VERSION
diff --git a/harbour/include/hbextsca.ch b/harbour/include/hbextsca.ch
index 93b3ede3ca..81d498cb27 100644
--- a/harbour/include/hbextsca.ch
+++ b/harbour/include/hbextsca.ch
@@ -18,6 +18,7 @@ EXTERNAL HBDATE
 EXTERNAL HBLOGICAL
 EXTERNAL HBNIL
 EXTERNAL HBNUMERIC
+EXTERNAL HBSYMBOL
 EXTERNAL HBTIMESTAMP
 
 #endif
diff --git a/harbour/include/hbextudd.ch b/harbour/include/hbextudd.ch
index 8fe1d4bef8..ce5e42678a 100644
--- a/harbour/include/hbextudd.ch
+++ b/harbour/include/hbextudd.ch
@@ -101,5 +101,15 @@ EXTERNAL UR_SUPER_UNLOCK
 EXTERNAL UR_SUPER_WRITEBHEADER
 EXTERNAL UR_SUPER_WRITEDBHEADER
 EXTERNAL UR_SUPER_ZAP
+EXTERNAL USRRDD_AREADATA
+EXTERNAL USRRDD_AREARESULT
+EXTERNAL USRRDD_GETFUNCTABLE
+EXTERNAL USRRDD_ID
+EXTERNAL USRRDD_RDDDATA
+EXTERNAL USRRDD_SETBOF
+EXTERNAL USRRDD_SETBOTTOM
+EXTERNAL USRRDD_SETEOF
+EXTERNAL USRRDD_SETFOUND
+EXTERNAL USRRDD_SETTOP
 
 #endif