diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 397ae44bb6..556cd84554 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-11 02:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+  * make_vc.mak
+  * make_gcc.mak
+    + Added -DHB_TR_LEVEL_DEBUG C compiler option when 
+      HB_BUILD_DEBUG=yes.
+
+  * source/rtl/hbinet.c
+    * Minor formatting.
+
 2008-11-11 01:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   + config/w32/pocc64.cf
     + Added Pelles C x64 GNU-make file.
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index ccf00f0fa6..3addf2c3f4 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -88,7 +88,7 @@ CFLAGSMT = -DHB_MT_VM
 !endif
 #-----------
 !if "$(HB_BUILD_DEBUG)" == "yes"
-    CFLAGS = -y -v $(CFLAGS)
+    CFLAGS = -y -v -DHB_TR_LEVEL_DEBUG $(CFLAGS)
 !endif
 #-----------
 !if "$(HB_BCCDLL_DYNRT)" == "-tWR"
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index a15b556bc6..bc7670eacc 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -157,7 +157,7 @@ CFLAGS         := -O3 $(CFLAGS)
 endif
 #-----------
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS         := -g $(CFLAGS)
+CFLAGS         := -g -DHB_TR_LEVEL_DEBUG $(CFLAGS)
 endif
 #-----------
 CLIBFLAGS      := -c $(CFLAGS)
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 693109761d..245ed86355 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -141,7 +141,7 @@ CFLAGS         = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \
 
 #-----------
 !if "$(HB_BUILD_DEBUG)" == "yes"
-CFLAGS         = -Zi $(CFLAGS)
+CFLAGS         = -Zi -DHB_TR_LEVEL_DEBUG $(CFLAGS)
 DBGMARKER      =  d
 !endif
 
diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c
index a08c9ada0a..25128e4c94 100644
--- a/harbour/source/rtl/hbinet.c
+++ b/harbour/source/rtl/hbinet.c
@@ -141,7 +141,10 @@
    #define HB_PARSOCKET( n )     ( ( HB_SOCKET_STRUCT * ) hb_parptrGC( hb_inetSocketFinalize, n ) )
 
    #define HB_SOCKET_ZERO_ERROR( s )   \
-      do { s->errorCode = 0; s->errorDesc = ""; } while( 0 )
+      do { \
+         s->errorCode = 0; \
+         s->errorDesc = ""; \
+      } while( 0 )
 
    #if defined( HB_OS_WIN_32 )
       #if defined( _MSC_VER ) && _MSC_VER >= 1400
@@ -162,7 +165,10 @@
       #endif
    #else
       #define HB_SOCKET_SET_ERROR( s )      \
-         do { s->errorCode = errno; s->errorDesc = strerror( errno ); } while( 0 )
+         do { \
+            s->errorCode = errno; \
+            s->errorDesc = strerror( errno ); \
+         } while( 0 )
    #endif
 
    #if defined( _MSC_VER ) && _MSC_VER >= 1400
@@ -187,13 +193,13 @@
 
    #define HB_SOCKET_INIT( s, p ) \
       do { \
-         s = ( HB_SOCKET_STRUCT * ) hb_gcAlloc( sizeof( HB_SOCKET_STRUCT ), hb_inetSocketFinalize );\
-         memset( s, '\0', sizeof( HB_SOCKET_STRUCT ) );\
-         s->com = ( HB_SOCKET_T ) -1;\
-         s->timeout = -1;\
-         s->timelimit = -1;\
-         s->errorDesc = "";\
-         p = hb_itemPutPtrGC( p, s );\
+         s = ( HB_SOCKET_STRUCT * ) hb_gcAlloc( sizeof( HB_SOCKET_STRUCT ), hb_inetSocketFinalize ); \
+         memset( s, '\0', sizeof( HB_SOCKET_STRUCT ) ); \
+         s->com = ( HB_SOCKET_T ) -1; \
+         s->timeout = -1; \
+         s->timelimit = -1; \
+         s->errorDesc = ""; \
+         p = hb_itemPutPtrGC( p, s ); \
       } while( 0 )
 
    #ifndef MSG_NOSIGNAL