From fa0db205a8b749ead3d4f4a00ee28927d5f446ec Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 11 May 2011 00:52:35 +0000
Subject: [PATCH] 2011-05-11 02:52 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * include/hbtrace.ch     * added way to disable HB_TR_ALWAYS    
   for more: 2011-04-16 23:04 UTC+0200 Viktor Szakats

  * contrib/hbxbp/hbxbp.hbp
  * contrib/hbqt/hbqt_common.hbm
    + disabled HB_TR_ALWAYS permanent messages from SVN builds
    ; TODO: move this logic to hbpre.hbm
---
 harbour/ChangeLog                    | 20 +++++++++++++++-----
 harbour/contrib/hbqt/hbqt_common.hbm |  2 ++
 harbour/contrib/hbxbp/hbxbp.hbp      |  2 ++
 harbour/include/hbtrace.ch           |  5 +++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 398d57fbc5..52f364f6da 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,14 +16,24 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-11 02:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbtrace.ch
+    * added way to disable HB_TR_ALWAYS
+      for more: 2011-04-16 23:04 UTC+0200 Viktor Szakats
+
+  * contrib/hbxbp/hbxbp.hbp
+  * contrib/hbqt/hbqt_common.hbm
+    + disabled HB_TR_ALWAYS permanent messages from SVN builds
+    ; TODO: move this logic to hbpre.hbm
+
 2011-05-10 17:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/hbqreportsmanager.prg
   * contrib/hbide/ideactions.prg
   * contrib/hbxbp/xbpdialog.prg
   * contrib/hbxbp/xbpmenubar.prg
-    ! Fixed: many artifacts related with XbpMenu() and MDI 
-      handelling. I did not know Xbase++ diverted from uniform 
-      arguments behavior for every object for XbpMenu() where 
+    ! Fixed: many artifacts related with XbpMenu() and MDI
+      handelling. I did not know Xbase++ diverted from uniform
+      arguments behavior for every object for XbpMenu() where
       :visible instance variable is FALSE by default.
       Thanks Shum for code and looking inside the docs.
 
@@ -58,8 +68,8 @@
   + include/hbstrict.ch
   * contrib/hbpost.hbm
     + added experimental -u+ header to catch some common code style
-      problems. currently IF() is caught, but it interferec with std.ch
-      hbsix.ch and possibly more, so it's not enabled
+      problems. currently IF() is caught, but it interferences with std.ch,
+      hbsix.ch, so it's not enabled
 
   * config/global.mk
   * src/dynlib/2nd/Makefile
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 84bcf7005c..a6d2162bd7 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -17,6 +17,8 @@
 
 -w3 -es2
 
+-prgflag=-D_HB_TR_NOALWAYS_
+
 -i.
 
 -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64|pcc}
diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp
index 844dbbe1fa..c82bc71e8e 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbp
+++ b/harbour/contrib/hbxbp/hbxbp.hbp
@@ -9,6 +9,8 @@
 
 -w3 -es2
 
+-prgflag=-D_HB_TR_NOALWAYS_
+
 ../hbqt/hbqtcore.hbc
 ../hbqt/hbqtgui.hbc
 
diff --git a/harbour/include/hbtrace.ch b/harbour/include/hbtrace.ch
index 02f35522be..3c71a563f1 100644
--- a/harbour/include/hbtrace.ch
+++ b/harbour/include/hbtrace.ch
@@ -65,6 +65,11 @@
 #define HB_TR_DEBUG      5
 #define HB_TR_LAST       6
 
+#ifdef _HB_TR_NOALWAYS_
+#undef HB_TR_ALWAYS
+#define HB_TR_ALWAYS     HB_TR_LAST
+#endif
+
 /*
  * Default tracing level.
  */