diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 35f68ce795..cfdab11abe 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,26 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-14 19:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * include/hbextern.ch
+    + Added hb_macroBlock()
+
+  * source/rtl/langapi.c
+    * One error text changed to be more precise.
+
+  * doc/gmake.txt
+  * bin/bld.bat
+  * contrib/hbbtree/tests/bld_vc.bat
+  * contrib/examples/pp/bld_vc.bat
+  * contrib/examples/guestbk/bld_vc.bat
+  * contrib/examples/pe/bld_vc.bat
+  * contrib/examples/dbu/bld_vc.bat
+  * contrib/examples/hscript/bld_vc.bat
+  * utils/hbdoc/bld_vc.bat
+  * utils/hbmake/bld_vc.bat
+  * utils/hbmake/hbmake.prg
+    - Removed MSVC -TP switches.
+
 2008-10-14 11:51 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbapi.h
   * harbour/source/vm/macro.c
diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat
index 979a4baac0..efb52f93c5 100644
--- a/harbour/bin/bld.bat
+++ b/harbour/bin/bld.bat
@@ -180,7 +180,7 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
 
    if not "%HB_COMPILER%" == "msvc" goto A_WIN_MSVC_NOT
 
-      cl -nologo -TP -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /subsystem:CONSOLE /LIBPATH:%HB_LIB_INSTALL% %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
+      cl -nologo -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /subsystem:CONSOLE /LIBPATH:%HB_LIB_INSTALL% %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
       goto CLEANUP
 
 :A_WIN_MSVC_NOT
diff --git a/harbour/contrib/examples/dbu/bld_vc.bat b/harbour/contrib/examples/dbu/bld_vc.bat
index a3394935bd..eec4ff4dcc 100644
--- a/harbour/contrib/examples/dbu/bld_vc.bat
+++ b/harbour/contrib/examples/dbu/bld_vc.bat
@@ -33,7 +33,7 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif
 ..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUUTIL.PRG /i..\..\..\include\
 ..\..\..\bin\harbour /n %HB_DIR_DBU%\DBUVIEW.PRG /i..\..\..\include\
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include dbu.c dbucopy.c dbuedit.c dbuhelp.c dbuindx.c dbunet.c dbustru.c dbuutil.c dbuview.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include dbu.c dbucopy.c dbuedit.c dbuhelp.c dbuindx.c dbunet.c dbustru.c dbuutil.c dbuview.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib gdi32.lib
 
 del *.obj
 
diff --git a/harbour/contrib/examples/guestbk/bld_vc.bat b/harbour/contrib/examples/guestbk/bld_vc.bat
index c8ed232886..8cddbf4b70 100644
--- a/harbour/contrib/examples/guestbk/bld_vc.bat
+++ b/harbour/contrib/examples/guestbk/bld_vc.bat
@@ -7,7 +7,7 @@ rem
 ..\..\..\bin\harbour /n inifiles /i..\..\..\include\
 ..\..\..\bin\harbour /n testcgi  /i..\..\..\include\
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\..\include guestbk.c inifiles.c testcgi.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include guestbk.c inifiles.c testcgi.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
 
 del *.obj
 
diff --git a/harbour/contrib/examples/hscript/bld_vc.bat b/harbour/contrib/examples/hscript/bld_vc.bat
index c76265291c..641043c768 100644
--- a/harbour/contrib/examples/hscript/bld_vc.bat
+++ b/harbour/contrib/examples/hscript/bld_vc.bat
@@ -6,7 +6,7 @@ rem
 rem NOTE: This sample program needs hbnf.lib from contrib/hbnf
 
 ..\..\..\bin\harbour hscript /n /i..\..\..\include
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\..\include hscript.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib hbnf.lib user32.lib winspool.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include hscript.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib hbnf.lib user32.lib winspool.lib
 del *.obj
 del hscript.c
 
diff --git a/harbour/contrib/examples/pe/bld_vc.bat b/harbour/contrib/examples/pe/bld_vc.bat
index f748c80310..616a49d457 100644
--- a/harbour/contrib/examples/pe/bld_vc.bat
+++ b/harbour/contrib/examples/pe/bld_vc.bat
@@ -6,7 +6,7 @@ rem
 ..\..\..\bin\harbour /n pe       /i..\..\..\include\
 ..\..\..\bin\harbour /n editorhi /i..\..\..\include\
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\..\include pe.c editorhi.c editorlo.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include pe.c editorhi.c editorlo.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
 
 del *.obj
 
diff --git a/harbour/contrib/examples/pp/bld_vc.bat b/harbour/contrib/examples/pp/bld_vc.bat
index e2d393f263..c438dbbc4c 100644
--- a/harbour/contrib/examples/pp/bld_vc.bat
+++ b/harbour/contrib/examples/pp/bld_vc.bat
@@ -3,7 +3,7 @@ rem
 rem $Id$
 rem
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\..\include pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcommon.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcommon.lib
 del *.obj
 
 pp
diff --git a/harbour/contrib/hbbtree/tests/bld_vc.bat b/harbour/contrib/hbbtree/tests/bld_vc.bat
index 281807b823..213b3cbcc7 100644
--- a/harbour/contrib/hbbtree/tests/bld_vc.bat
+++ b/harbour/contrib/hbbtree/tests/bld_vc.bat
@@ -5,7 +5,7 @@ rem
 
 ..\..\..\bin\harbour /w3 /q /n /km /i..\..\..\include test ttest
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\..\include test.c ttest.c ctest.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib hbct.lib hbbtree.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include test.c ttest.c ctest.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib hbct.lib hbbtree.lib
 
 del *.obj
 del test.c ttest.c
diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt
index 439a2b1b35..5af7b8c067 100644
--- a/harbour/doc/gmake.txt
+++ b/harbour/doc/gmake.txt
@@ -159,7 +159,6 @@ For MSVC on Win95/WinNT:
          not set to unix
 
          For best results, in your copy of make_gnu.bat, also set:
-  C_USR=-TP
   HB_ARCHITECTURE   w32
   HB_COMPILER       msvc
   HB_GT_LIB         gtwin
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index 25cbb9e3be..f863376d5e 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -869,6 +869,7 @@ EXTERNAL HB_USERNAME
 EXTERNAL HB_RUN
 EXTERNAL HB_GETREADVAR
 EXTERNAL HB_DISABLEWAITLOCKS
+EXTERNAL HB_MACROBLOCK
 
 EXTERNAL HB_INISETCOMMENT
 EXTERNAL HB_INIREAD
diff --git a/harbour/source/rtl/langapi.c b/harbour/source/rtl/langapi.c
index b32be5bbc8..283dab8481 100644
--- a/harbour/source/rtl/langapi.c
+++ b/harbour/source/rtl/langapi.c
@@ -157,7 +157,7 @@ static HB_LANG s_lang_en =
       "",
       "",
       "",
-      "Object Destructor Failure",
+      "Memory object destructor failure",
       "array access",
       "array assign",
       "array dimension",
diff --git a/harbour/utils/hbdoc/bld_vc.bat b/harbour/utils/hbdoc/bld_vc.bat
index e1e2e47d0c..a648e41b98 100644
--- a/harbour/utils/hbdoc/bld_vc.bat
+++ b/harbour/utils/hbdoc/bld_vc.bat
@@ -5,7 +5,7 @@ rem
 
 ..\..\bin\harbour /w3 /q /n /km /i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c hbdfrdln.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c hbdfrdln.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib
 
 del *.obj
 del hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c
diff --git a/harbour/utils/hbmake/bld_vc.bat b/harbour/utils/hbmake/bld_vc.bat
index 80dc565faf..d40b5acb29 100644
--- a/harbour/utils/hbmake/bld_vc.bat
+++ b/harbour/utils/hbmake/bld_vc.bat
@@ -5,7 +5,7 @@ rem
 
 ..\..\bin\harbour /w3 /q /n /km /i..\..\include hbmake
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib
+cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\include hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib
 
 del *.obj
 del hbmake.c
diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg
index a585d5fc29..3683d6d652 100644
--- a/harbour/utils/hbmake/hbmake.prg
+++ b/harbour/utils/hbmake/hbmake.prg
@@ -2709,7 +2709,7 @@ Endif // Create and compile
    ELSEIF s_lMSVcc
 
       FWrite( s_nMakeFileHandle, ;
-         "CFLAG1 =  -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(SHELL)  $(CFLAGS)" +IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + s_cEOL +;
+         "CFLAG1 =  -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" +IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + s_cEOL +;
          "CFLAG2 =  -c" +" -I" + ALLTRIM( s_cUserInclude ) + " " + s_cEOL +;
          "RFLAGS = " + s_cEOL +;
          "LFLAGS = /LIBPATH:$(CC_DIR)\lib /LIBPATH1:$(HB_DIR)\lib /LIBPATH2:$(C4W)\lib"  +IIF(s_lMt, " /Nodefaultlib:LIBC "," /Nodefaultlib:LIBCMT " ) + s_cEOL +;
@@ -3882,7 +3882,7 @@ FUNCTION CreateLibMakeFile( cFile )
    ELSEIF s_lMSVcc
 
       FWrite( s_nMakeFileHandle, ;
-         "CFLAG1 =  -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" + s_cEOL +;
+         "CFLAG1 =  -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" + s_cEOL +;
          "CFLAG2 =  -c -I" + ALLTRIM( s_cUserInclude ) + s_cEOL +;
          "RFLAGS = " + s_cEOL +;
          "LFLAGS = " + s_cEOL +;