From 8220d099e201273ff6e4b423a4f8d87305541bd3 Mon Sep 17 00:00:00 2001
From: Phil Krylov <phil@krylov.eu>
Date: Fri, 8 Dec 2023 01:21:05 +0100
Subject: [PATCH] 2023-12-07 21:00 UTC+0100 Phil Krylov (phil a t krylov.eu)  
 * config/win/bcc.mk   * utils/hbmk2/hbmk2.prg     ! Fixed Borland C 32-bit
 compiler warning flags.

---
 ChangeLog.txt         | 5 +++++
 config/win/bcc.mk     | 4 ++--
 utils/hbmk2/hbmk2.prg | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5b87575f40..9e33e8713c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,11 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2023-12-07 21:00 UTC+0100 Phil Krylov (phil a t krylov.eu)
+  * config/win/bcc.mk
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed Borland C 32-bit compiler warning flags.
+
 2023-12-07 20:00 UTC+0100 Phil Krylov (phil a t krylov.eu)
   * .github/workflows/linux-ci.yml
     ! Linux CI build fix (outdated packages).
diff --git a/config/win/bcc.mk b/config/win/bcc.mk
index d878b43d72..3ed2af8a8d 100644
--- a/config/win/bcc.mk
+++ b/config/win/bcc.mk
@@ -25,9 +25,9 @@ CFLAGS += -I. -I$(HB_HOST_INC)
 CFLAGS += -q -tWM -CP437
 
 ifeq ($(HB_BUILD_WARN),no)
-   CFLAGS += -w-sig- -w-aus- -w-ccc- -w-csu- -w-par- -w-rch- -w-ucp- -w-use- -w-prc- -w-pia-
+   CFLAGS += -w-aus -w-ccc -w-csu -w-ovf -w-par -w-rch -w-spa
 else
-   CFLAGS += -w -Q -w-sig-
+   CFLAGS += -w -Q -w-sig
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index 80677968a1..795b720510 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -5048,8 +5048,9 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
          ENDIF
          SWITCH hbmk[ _HBMK_nWARN ]
          CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q" )         ; EXIT
-         CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q -w-sig-" ) ; EXIT
-         CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-sig- -w-aus- -w-ccc- -w-csu- -w-par- -w-rch- -w-ucp- -w-use- -w-prc- -w-pia-" ) ; EXIT
+         CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q -w-sig" ) ; EXIT
+         // The following line differs from the line in config/win/bcc.mk because Make needs to build core, and hbmk2 needs to build contrib
+         CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-sig -w-aus -w-ccc -w-csu -w-ovf -w-par -w-rch -w-spa -w-sus -w-pia" ) ; EXIT
          CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-" )           ; EXIT
          ENDSWITCH
          cOpt_CompC += " {FC} {LC}"