From 7df007ad2488eb071839f41382bcab975c391ce2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 23 Apr 2010 00:30:50 +0000
Subject: [PATCH] 2010-04-23 02:26 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     * Changed low warning level for
 msvc/icc compilers to -W2       (-W1 is the default).

  * config/wce/msvcarm.mk
  * config/win/icc.mk
  * config/win/msvc.mk
    + Upped 'HB_BUILD_WARN=no' warning level for msvc/icc
      compilers to '-W2'. (matching hbmk2 -warn=low level)

  * config/dos/watcom.mk
  * config/win/watcom.mk
  * config/linux/watcom.mk
  * config/os2/watcom.mk
    + Upped 'HB_BUILD_WARN=no' warning level for msvc/icc
      compilers to '-w1'. (matching hbmk2 -warn=low level)
---
 harbour/ChangeLog              | 19 +++++++++++++++++++
 harbour/config/dos/watcom.mk   |  2 ++
 harbour/config/linux/watcom.mk |  2 ++
 harbour/config/os2/watcom.mk   |  2 ++
 harbour/config/wce/msvcarm.mk  |  2 ++
 harbour/config/win/icc.mk      |  2 ++
 harbour/config/win/msvc.mk     |  2 ++
 harbour/config/win/watcom.mk   |  2 ++
 harbour/utils/hbmk2/hbmk2.prg  |  4 ++--
 9 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0caa347e43..db4afd3477 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,24 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-23 02:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    * Changed low warning level for msvc/icc compilers to -W2
+      (-W1 is the default).
+
+  * config/wce/msvcarm.mk
+  * config/win/icc.mk
+  * config/win/msvc.mk
+    + Upped 'HB_BUILD_WARN=no' warning level for msvc/icc
+      compilers to '-W2'. (matching hbmk2 -warn=low level)
+
+  * config/dos/watcom.mk
+  * config/win/watcom.mk
+  * config/linux/watcom.mk
+  * config/os2/watcom.mk
+    + Upped 'HB_BUILD_WARN=no' warning level for msvc/icc
+      compilers to '-w1'. (matching hbmk2 -warn=low level)
+
 2010-04-23 01:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     * Reverted bcc experimental warning tweak.
@@ -38,6 +56,7 @@
   * config/sunos/gcc.mk
     + Upped 'HB_BUILD_WARN=no' warning level for GCC
       and compatible compilers to '-W'.
+      (matching hbmk2 -warn=low level)
 
   * config/linux/sunpro.mk
   * config/sunos/sunpro.mk
diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk
index a58790b74a..65fe095dac 100644
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -22,6 +22,8 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
+else
+   CFLAGS += -w1
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk
index 87f4a801a8..2d82d41c2a 100644
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -21,6 +21,8 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
+else
+   CFLAGS += -w1
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk
index 4519fdebb1..05d6a75b5a 100644
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -23,6 +23,8 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
+else
+   CFLAGS += -w1
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index 0128459059..0aec680d73 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -56,6 +56,8 @@ ifneq ($(HB_BUILD_WARN),no)
    else
       CFLAGS += -W4 -wd4127
    endif
+else
+   CFLAGS += -W2
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk
index ffb39e0273..95e3220f04 100644
--- a/harbour/config/win/icc.mk
+++ b/harbour/config/win/icc.mk
@@ -28,6 +28,8 @@ endif
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W3
+else
+   CFLAGS += -W2
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk
index 12cb8fdbde..9838f001da 100644
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -35,6 +35,8 @@ endif
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W4 -wd4127
+else
+   CFLAGS += -W2
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index 741588934f..4f42348833 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -23,6 +23,8 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
+else
+   CFLAGS += -w1
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index fe6b3daba1..9d6e5d16d6 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3306,7 +3306,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             SWITCH hbmk[ _HBMK_nWARN ]
             CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-W4" ) ; EXIT
             CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W3" ) ; EXIT /* -W4 is deadly on icc */
-            CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-W1" ) ; EXIT
+            CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-W2" ) ; EXIT
             CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-W0" ) ; EXIT
             ENDSWITCH
          ELSE
@@ -3321,7 +3321,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
                   AAdd( hbmk[ _HBMK_aOPTC ], "-W4 -wd4127" )
                ENDIF
                EXIT
-            CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-W1" ) ; EXIT
+            CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-W2" ) ; EXIT
             CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-W0" ) ; EXIT
             ENDSWITCH
          ENDIF