From 7f7c61cf2af44c5d0b618129d87b43f5a2043b38 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 12 Oct 2008 11:32:17 +0000
Subject: [PATCH] 2008-10-11 13:27 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * make_vc.mak   * contrib/mtpl_vc.mak     + Added /nologo to lib
 commands.

  * source/rtl/fserror.c
    * Minor formatting.

  * ChangeLog
    + Marked change as TOMERGE 1.0.
---
 harbour/ChangeLog            | 12 +++++++
 harbour/contrib/mtpl_vc.mak  |  2 +-
 harbour/make_vc.mak          | 62 ++++++++++++++++++------------------
 harbour/source/rtl/fserror.c |  2 +-
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 65b6dadfbd..31e4a9e780 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-11 13:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * make_vc.mak
+  * contrib/mtpl_vc.mak
+    + Added /nologo to lib commands.
+
+  * source/rtl/fserror.c
+    * Minor formatting.
+
+  * ChangeLog
+    + Marked change as TOMERGE 1.0.
+
 2008-10-12 13:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbthread.h
     * casting cleanup
@@ -27,6 +38,7 @@
 
   * harbour/source/vm/classes.c
     ! fixed profiler usage
+      [TOMERGE 1.0]
 
 2008-10-11 21:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * bin/bld.bat
diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak
index b167025db0..a1d8941ce6 100644
--- a/harbour/contrib/mtpl_vc.mak
+++ b/harbour/contrib/mtpl_vc.mak
@@ -159,7 +159,7 @@ ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS)
 #**********************************************************
 $(LIB_PATH) : $(LIB_OBJS)
     if exist "$@" $(DEL) "$@" > nul
-    $(MKLIB) /out:$@ @<<
+    $(MKLIB) /nologo /out:$@ @<<
 $**
 <<$(HB_KEEPSTATE)
 #**********************************************************
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 1cd6a07e79..0aa479a063 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -153,8 +153,8 @@ CFLAGSMT = -MT$(DBGMARKER) -DHB_MT_VM
 
 CLIBFLAGS      = -c $(CFLAGS)
 !if "$(HB_BUILD_WINCE)" == "yes"
-CLIBFLAGSDLL   =  $(CLIBFLAGS) -DHB_DYNLIB
-CEXEFLAGSDLL   =  $(CLIBFLAGS)
+CLIBFLAGSDLL   = $(CLIBFLAGS) -DHB_DYNLIB
+CEXEFLAGSDLL   = $(CLIBFLAGS)
 !else
 CLIBFLAGSDLL   = -MT$(DBGMARKER) $(CLIBFLAGS) -DHB_DYNLIB
 CEXEFLAGSDLL   = -MT$(DBGMARKER) $(CLIBFLAGS)
@@ -721,88 +721,88 @@ $(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL):
 # LIBRARY Targets BUILD rules
 #**********************************************************
 $(COMMON_LIB)   : $(COMMON_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(PP_LIB)       : $(PP_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(COMPILER_LIB) : $(COMPILER_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(VM_LIB)       : $(VM_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(VMMT_LIB)     : $(VMMT_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(RTL_LIB)      : $(RTL_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(MACRO_LIB)    : $(MACRO_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(DEBUG_LIB)    : $(DEBUG_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(LANG_LIB)     : $(LANG_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(CODEPAGE_LIB) : $(CODEPAGE_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(PCRE_LIB)     : $(PCRE_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(HBZLIB_LIB)   : $(HBZLIB_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(HBEXTERN_LIB) : $(HBEXTERN_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(RDD_LIB)      : $(RDD_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(NULSYS_LIB)   : $(NULSYS_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(DBFNTX_LIB)   : $(DBFNTX_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(DBFCDX_LIB)   : $(DBFCDX_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(DBFFPT_LIB)   : $(DBFFPT_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(HBSIX_LIB)    : $(HBSIX_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(HSX_LIB)      : $(HSX_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(USRRDD_LIB)   : $(USRRDD_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTCGI_LIB)    : $(GTCGI_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTDOS_LIB)    : $(GTDOS_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTPCA_LIB)    : $(GTPCA_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTSTD_LIB)    : $(GTSTD_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTWIN_LIB)    : $(GTWIN_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTWVT_LIB)    : $(GTWVT_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 $(GTGUI_LIB)    : $(GTGUI_LIB_OBJS)
-    $(MKLIB) /out:$@ $**
+    $(MKLIB) /nologo /out:$@ $**
 #**********************************************************
 
 #**********************************************************
@@ -906,7 +906,7 @@ $(STANDARD_SYSLIBS)
 #**********************************************************
 # DLL EXECUTABLE Targets
 #**********************************************************
-HBTESTDLL_OBJS =  $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc)
+HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc)
 $(HBTESTDLL_EXE) : $(HARBOUR_DLL) $(HBTESTDLL_OBJS)
     $(LINKER) @<<
 $(LDFLAGS)
diff --git a/harbour/source/rtl/fserror.c b/harbour/source/rtl/fserror.c
index f121a2e1b6..7a897f2373 100644
--- a/harbour/source/rtl/fserror.c
+++ b/harbour/source/rtl/fserror.c
@@ -160,7 +160,7 @@ static int hb_WinToDosError( ULONG ulError )
       case ERROR_PATH_NOT_FOUND:
          iResult = 3;
          break;
-      case  ERROR_TOO_MANY_OPEN_FILES:
+      case ERROR_TOO_MANY_OPEN_FILES:
          iResult = 4;
          break;
       case ERROR_INVALID_HANDLE: