diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1ad73b8612..1b1f742761 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -10,6 +10,35 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-21 15:55 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * include/hbtrace.h
+    ! fixed empty HB_TRACE() definitions to be 'do {} while( 0 )'
+      as suggested by Przemek.
+
+  * contrib/hbsqlit3/core.c
+  * contrib/hbwin/axcore.c
+  * contrib/hbzebra/datamtrx.c
+  * contrib/hbzebra/qrcode.c
+  * contrib/rddads/ads1.c
+  * contrib/rddads/adsfunc.c
+    * deleted {} block where HB_TRACE() was the only
+      call made from the the block. It's now unnecessary.
+
+  * contrib/hbzebra/codabar.c
+  * contrib/hbzebra/code11.c
+  * contrib/hbzebra/code128.c
+  * contrib/hbzebra/code39.c
+  * contrib/hbzebra/code93.c
+  * contrib/hbzebra/core.c
+  * contrib/hbzebra/datamtrx.c
+  * contrib/hbzebra/eanupc.c
+  * contrib/hbzebra/itf.c
+  * contrib/hbzebra/msi.c
+  * contrib/hbzebra/pdf417.c
+  * contrib/hbzebra/qrcode.c
+    * deleted few more unnecessary {} from single statement
+      blocks
+
 2012-11-21 15:36 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbwin/win_regc.c
     % merged UNICODE/non-UNICODE branch by using sizeof().
diff --git a/harbour/contrib/hbsqlit3/core.c b/harbour/contrib/hbsqlit3/core.c
index 10385f81c3..d7ff08a2a7 100644
--- a/harbour/contrib/hbsqlit3/core.c
+++ b/harbour/contrib/hbsqlit3/core.c
@@ -677,16 +677,12 @@ HB_FUNC( SQLITE3_TEMP_DIRECTORY )
             if( hb_fsMkDir( pszDirName ) )
                bResult = HB_TRUE;
             else
-            {
                HB_TRACE( HB_TR_DEBUG,
                          ( "sqlite_temp_directory(): Can't create directory %s", pszDirName ) );
-            }
          }
          else
-         {
             HB_TRACE( HB_TR_DEBUG,
                       ( "sqlite_temp_directory(): Directory doesn't exist %s", pszDirName ) );
-         }
       }
 
       if( bResult )
diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c
index cedfc409d2..dd1e4fac68 100644
--- a/harbour/contrib/hbwin/axcore.c
+++ b/harbour/contrib/hbwin/axcore.c
@@ -422,9 +422,7 @@ static HRESULT _get_default_sink( IDispatch * iDisp, const char * szEvent, IID *
             return S_OK;
       }
       else
-      {
          HB_TRACE( HB_TR_DEBUG, ( "_get_default_sink IProvideClassInfo2 obtain error %08lX", hr ) );
-      }
 
 
       /* Method 2: using IProvideClassInfo and searching for default source in ITypeInfo */
@@ -469,9 +467,7 @@ static HRESULT _get_default_sink( IDispatch * iDisp, const char * szEvent, IID *
          HB_VTBL( iPCI )->Release( HB_THIS( iPCI ) );
       }
       else
-      {
          HB_TRACE( HB_TR_DEBUG, ( "_get_default_sink IProvideClassInfo obtain error %08lX", hr ) );
-      }
    }
 
 
diff --git a/harbour/contrib/hbzebra/codabar.c b/harbour/contrib/hbzebra/codabar.c
index e3844963b5..9b4bafc421 100644
--- a/harbour/contrib/hbzebra/codabar.c
+++ b/harbour/contrib/hbzebra/codabar.c
@@ -175,9 +175,7 @@ HB_FUNC( HB_ZEBRA_CREATE_CODABAR )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_codabar( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/code11.c b/harbour/contrib/hbzebra/code11.c
index a3cdc4ec05..33387647ec 100644
--- a/harbour/contrib/hbzebra/code11.c
+++ b/harbour/contrib/hbzebra/code11.c
@@ -168,10 +168,7 @@ HB_FUNC( HB_ZEBRA_CREATE_CODE11 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_code11( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
-
diff --git a/harbour/contrib/hbzebra/code128.c b/harbour/contrib/hbzebra/code128.c
index 65b84eb25d..fbc7cf8e82 100644
--- a/harbour/contrib/hbzebra/code128.c
+++ b/harbour/contrib/hbzebra/code128.c
@@ -395,9 +395,7 @@ HB_FUNC( HB_ZEBRA_CREATE_CODE128 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_code128( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/code39.c b/harbour/contrib/hbzebra/code39.c
index 9e9697fda5..8f3d1aa3f5 100644
--- a/harbour/contrib/hbzebra/code39.c
+++ b/harbour/contrib/hbzebra/code39.c
@@ -211,9 +211,7 @@ HB_FUNC( HB_ZEBRA_CREATE_CODE39 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_code39( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/code93.c b/harbour/contrib/hbzebra/code93.c
index fc6908ee89..bd2da04c53 100644
--- a/harbour/contrib/hbzebra/code93.c
+++ b/harbour/contrib/hbzebra/code93.c
@@ -264,9 +264,7 @@ HB_FUNC( HB_ZEBRA_CREATE_CODE93 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_code93( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/core.c b/harbour/contrib/hbzebra/core.c
index 9d3f4043c4..dc0e85aa49 100644
--- a/harbour/contrib/hbzebra/core.c
+++ b/harbour/contrib/hbzebra/core.c
@@ -273,9 +273,7 @@ HB_FUNC( HB_ZEBRA_GETERROR )
    PHB_ZEBRA pZebra = hb_zebra_param( 1 );
 
    if( pZebra )
-   {
       hb_retni( pZebra->iError );
-   }
 }
 
 
@@ -284,7 +282,5 @@ HB_FUNC( HB_ZEBRA_GETCODE )
    PHB_ZEBRA pZebra = hb_zebra_param( 1 );
 
    if( pZebra )
-   {
       hb_retc( pZebra->szCode );
-   }
 }
diff --git a/harbour/contrib/hbzebra/datamtrx.c b/harbour/contrib/hbzebra/datamtrx.c
index 2f8c744614..ead4ebfecd 100644
--- a/harbour/contrib/hbzebra/datamtrx.c
+++ b/harbour/contrib/hbzebra/datamtrx.c
@@ -457,18 +457,14 @@ PHB_ZEBRA hb_zebra_create_datamatrix( const char * szCode, HB_SIZE nLen, int iFl
 
    pCW = ( unsigned char * ) hb_xrealloc( pCW, pSize->iDataSize + iErrorSize );
    for( i = iDataCount; i < pSize->iDataSize; i++ )
-   {
       pCW[ i ] = PADDING;
-   }
 
    /* Reed-Solomon error correction */
    _datamatrix_reed_solomon( pCW, pSize );
 
 #if 0
    for( i = 0; i < pSize->iDataSize + iErrorSize; i++ )
-   {
       HB_TRACE( HB_TR_ALWAYS, ( "cw=%d", pCW[ i ] ) );
-   }
 #endif
 
    pZebra->iCol = pSize->iCol;
@@ -507,9 +503,7 @@ HB_FUNC( HB_ZEBRA_CREATE_DATAMATRIX )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_datamatrix( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/eanupc.c b/harbour/contrib/hbzebra/eanupc.c
index c44b372122..c11bfcf03e 100644
--- a/harbour/contrib/hbzebra/eanupc.c
+++ b/harbour/contrib/hbzebra/eanupc.c
@@ -388,9 +388,7 @@ HB_FUNC( HB_ZEBRA_CREATE_EAN13 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_ean13( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
@@ -400,9 +398,7 @@ HB_FUNC( HB_ZEBRA_CREATE_EAN8 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_ean8( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
@@ -412,9 +408,7 @@ HB_FUNC( HB_ZEBRA_CREATE_UPCA )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_upca( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
@@ -424,9 +418,7 @@ HB_FUNC( HB_ZEBRA_CREATE_UPCE )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_upce( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/itf.c b/harbour/contrib/hbzebra/itf.c
index 44cf74e0b8..7485e42e04 100644
--- a/harbour/contrib/hbzebra/itf.c
+++ b/harbour/contrib/hbzebra/itf.c
@@ -152,9 +152,7 @@ HB_FUNC( HB_ZEBRA_CREATE_ITF )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_itf( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/msi.c b/harbour/contrib/hbzebra/msi.c
index 00f14d6cfe..722db88356 100644
--- a/harbour/contrib/hbzebra/msi.c
+++ b/harbour/contrib/hbzebra/msi.c
@@ -165,9 +165,7 @@ HB_FUNC( HB_ZEBRA_CREATE_MSI )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_msi( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/pdf417.c b/harbour/contrib/hbzebra/pdf417.c
index 39891bc741..4aa3d9818a 100644
--- a/harbour/contrib/hbzebra/pdf417.c
+++ b/harbour/contrib/hbzebra/pdf417.c
@@ -1404,9 +1404,7 @@ HB_FUNC( HB_ZEBRA_CREATE_PDF417 )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_pdf417( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ), hb_parni( 3 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/hbzebra/qrcode.c b/harbour/contrib/hbzebra/qrcode.c
index a93d80e532..f972b0ad2b 100644
--- a/harbour/contrib/hbzebra/qrcode.c
+++ b/harbour/contrib/hbzebra/qrcode.c
@@ -573,14 +573,10 @@ static PHB_BITBUFFER _qr_interlace( PHB_BITBUFFER pData, unsigned char * pECC, i
 
 #ifdef DEBUG_CODE
    if( uiDst != pVersion->uiTotal )
-   {
       HB_TRACE( HB_TR_ALWAYS, ( "ERROR!!! uiDst:%d  pVersion->uiTotal:%d", uiDst, pVersion->uiTotal ) );
-   }
 
    for( uiPos = 0; uiPos < pVersion->uiTotal; uiPos++ )
-   {
       HB_TRACE( HB_TR_ALWAYS, ( "interlaced:%3d %02X", ( int ) s_rev[ ( unsigned char ) pRetBuf[ uiPos ] ], ( int ) s_rev[ ( unsigned char ) pRetBuf[ uiPos ] ] ) );
-   }
 #endif
    return pRet;
 }
@@ -734,9 +730,7 @@ static int _qr_dataencode( const char * szCode, HB_SIZE nSize, PHB_BITBUFFER pDa
 
 #ifdef DEBUG_CODE
    for( m = 0; m < iDataLen; m++ )
-   {
       HB_TRACE( HB_TR_ALWAYS, ( "data:%3d %02X", s_rev[ *( hb_bitbuffer_buffer( pData ) + m ) ], s_rev[ *( hb_bitbuffer_buffer( pData ) + m ) ] ) );
-   }
 #endif
    return iVersion;
 }
@@ -820,9 +814,7 @@ static unsigned char * _qr_checksum( PHB_BITBUFFER pData, int iVersion, int iLev
 
 #ifdef DEBUG_CODE
    for( i = 0; i <= iECCLen; i++ )
-   {
       HB_TRACE( HB_TR_ALWAYS, ( "POLY[%3d %02X]:%3d %02X", i, i, pPoly[ i ], pPoly[ i ] ) );
-   }
 #endif
 
    pECC = ( unsigned char * ) hb_xgrab( pLevel->block[ 0 ].uiECC * ( pLevel->block[ 0 ].uiCount + pLevel->block[ 1 ].uiCount ) );
@@ -863,9 +855,7 @@ static unsigned char * _qr_checksum( PHB_BITBUFFER pData, int iVersion, int iLev
 #ifdef DEBUG_CODE
    iECCLen = pLevel->block[ 0 ].uiECC * ( pLevel->block[ 0 ].uiCount + pLevel->block[ 1 ].uiCount );
    for( i = 0; i < iECCLen; i++ )
-   {
       HB_TRACE( HB_TR_ALWAYS, ( "ecc:%3d %02X", ( int ) ( unsigned char ) pECC[ i ], ( int ) ( unsigned char ) pECC[ i ] ) );
-   }
 #endif
    return pECC;
 }
@@ -1176,7 +1166,7 @@ static int _qr_mask( PHB_BITBUFFER pBits, int iVersion )
    }
 #ifdef DEBUG_CODE
    HB_TRACE( HB_TR_ALWAYS, ( "mask:%d", iMaskMin ) );
-//   iMaskMin = 0;
+/* iMaskMin = 0; */
    HB_TRACE( HB_TR_ALWAYS, ( "mask applied:%d", iMaskMin ) );
 #endif
    _qr_mask_pattern( pBits, iVersion, iMaskMin );
@@ -1309,9 +1299,7 @@ HB_FUNC( HB_ZEBRA_CREATE_QRCODE )
    PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
 
    if( pItem )
-   {
       hb_zebra_ret( hb_zebra_create_qrcode( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ), hb_parni( 2 ) ) );
-   }
    else
       hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c
index 6e3c3f92a5..4d0bde5d02 100644
--- a/harbour/contrib/rddads/ads1.c
+++ b/harbour/contrib/rddads/ads1.c
@@ -746,9 +746,8 @@ HB_ERRCODE hb_adsCloseCursor( ADSAREAP pArea )
       UNSIGNED32 u32RetVal = AdsCloseTable( pArea->hTable );
 
       if( u32RetVal != AE_SUCCESS )
-      {
          HB_TRACE( HB_TR_DEBUG, ( "adsCloseTable(%lu, %s) failed", ( HB_ULONG ) u32RetVal, pArea->szDataFileName ) );
-      }
+
       pArea->hTable = 0;
    }
    if( pArea->hStatement )
diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c
index 8cb5a79a47..7b429db107 100644
--- a/harbour/contrib/rddads/adsfunc.c
+++ b/harbour/contrib/rddads/adsfunc.c
@@ -393,9 +393,7 @@ HB_FUNC( ADSGETSERVERTIME )
    /* QUESTION: Returning NIL on error. Is this what we want? [vszakats] */
 #if HB_TR_LEVEL >= HB_TR_DEBUG
    else
-   {
       HB_TRACE( HB_TR_DEBUG, ( "AdsGetServerTime() error" ) );
-   }
 #endif
 }
 
@@ -1451,9 +1449,7 @@ UNSIGNED32 WINAPI hb_adsShowPercentageCB( UNSIGNED16 usPercentDone )
    }
 #if HB_TR_LEVEL >= HB_TR_DEBUG
    else
-   {
       HB_TRACE( HB_TR_DEBUG, ( "hb_adsShowPercentageCB(%d) called with no codeblock set.", usPercentDone ) );
-   }
 #endif
 
    return 0;
diff --git a/harbour/include/hbtrace.h b/harbour/include/hbtrace.h
index fc2e27cc4b..f0f829aa12 100644
--- a/harbour/include/hbtrace.h
+++ b/harbour/include/hbtrace.h
@@ -122,37 +122,37 @@ HB_EXTERN_BEGIN
 #if HB_TR_LEVEL >= HB_TR_DEBUG
 #define HB_ECHO_TRACE_HB_TR_DEBUG(x)    HB_ECHO_CREATE(HB_TR_DEBUG, x)
 #else
-#define HB_ECHO_TRACE_HB_TR_DEBUG(x)    {}
+#define HB_ECHO_TRACE_HB_TR_DEBUG(x)    do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_INFO
 #define HB_ECHO_TRACE_HB_TR_INFO(x)     HB_ECHO_CREATE(HB_TR_INFO, x)
 #else
-#define HB_ECHO_TRACE_HB_TR_INFO(x)     {}
+#define HB_ECHO_TRACE_HB_TR_INFO(x)     do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_WARNING
 #define HB_ECHO_TRACE_HB_TR_WARNING(x)  HB_ECHO_CREATE(HB_TR_WARNING, x)
 #else
-#define HB_ECHO_TRACE_HB_TR_WARNING(x)  {}
+#define HB_ECHO_TRACE_HB_TR_WARNING(x)  do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_ERROR
 #define HB_ECHO_TRACE_HB_TR_ERROR(x)    HB_ECHO_CREATE(HB_TR_ERROR, x)
 #else
-#define HB_ECHO_TRACE_HB_TR_ERROR(x)    {}
+#define HB_ECHO_TRACE_HB_TR_ERROR(x)    do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_FATAL
 #define HB_ECHO_TRACE_HB_TR_FATAL(x)    HB_ECHO_CREATE(HB_TR_FATAL, x)
 #else
-#define HB_ECHO_TRACE_HB_TR_FATAL(x)    {}
+#define HB_ECHO_TRACE_HB_TR_FATAL(x)    do {} while( 0 )
 #endif
 
 #if 1  /* always! */
 #define HB_ECHO_TRACE_HB_TR_ALWAYS(x)   HB_ECHO_CREATE(HB_TR_ALWAYS, x)
 #else
-#define HB_ECHO_TRACE_HB_TR_ALWAYS(x)   {}
+#define HB_ECHO_TRACE_HB_TR_ALWAYS(x)   do {} while( 0 )
 #endif
 
 
@@ -171,37 +171,37 @@ HB_EXTERN_BEGIN
 #if HB_TR_LEVEL >= HB_TR_DEBUG
 #define HB_ECHO_STEALTH_HB_TR_DEBUG(x)    HB_ECHO_STEALTH(HB_TR_DEBUG, x)
 #else
-#define HB_ECHO_STEALTH_HB_TR_DEBUG(x)    {}
+#define HB_ECHO_STEALTH_HB_TR_DEBUG(x)    do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_INFO
 #define HB_ECHO_STEALTH_HB_TR_INFO(x)     HB_ECHO_STEALTH(HB_TR_INFO, x)
 #else
-#define HB_ECHO_STEALTH_HB_TR_INFO(x)     {}
+#define HB_ECHO_STEALTH_HB_TR_INFO(x)     do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_WARNING
 #define HB_ECHO_STEALTH_HB_TR_WARNING(x)  HB_ECHO_STEALTH(HB_TR_WARNING, x)
 #else
-#define HB_ECHO_STEALTH_HB_TR_WARNING(x)  {}
+#define HB_ECHO_STEALTH_HB_TR_WARNING(x)  do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_ERROR
 #define HB_ECHO_STEALTH_HB_TR_ERROR(x)    HB_ECHO_STEALTH(HB_TR_ERROR, x)
 #else
-#define HB_ECHO_STEALTH_HB_TR_ERROR(x)    {}
+#define HB_ECHO_STEALTH_HB_TR_ERROR(x)    do {} while( 0 )
 #endif
 
 #if HB_TR_LEVEL >= HB_TR_FATAL
 #define HB_ECHO_STEALTH_HB_TR_FATAL(x)    HB_ECHO_STEALTH(HB_TR_FATAL, x)
 #else
-#define HB_ECHO_STEALTH_HB_TR_FATAL(x)    {}
+#define HB_ECHO_STEALTH_HB_TR_FATAL(x)    do {} while( 0 )
 #endif
 
 #if 1  /* always! */
 #define HB_ECHO_STEALTH_HB_TR_ALWAYS(x)   HB_ECHO_STEALTH(HB_TR_ALWAYS, x)
 #else
-#define HB_ECHO_STEALTH_HB_TR_ALWAYS(x)   {}
+#define HB_ECHO_STEALTH_HB_TR_ALWAYS(x)   do {} while( 0 )
 #endif
 
 /* NOTE: This will print tracing info without changing current