commit d211558044c710d1d5f17f5fd4687f0c769deab2
author Yegappan Lakshmanan <yegappan@yahoo.com> Thu Apr 03 21:35:00 2025 +0200
committer Christian Brabandt <cb@256bit.org> Thu Apr 03 21:35:00 2025 +0200
tree 77c43af2efd2a11ecbf2e10264954f9961dda68e
parent 6fa62085ffbfb3c69636da857574a017783f0410

patch 9.1.1275: MS-Windows: Not possible to pass additional flags to Make_mvc

Problem:  MS-Windows: Not possible to pass additional flags to Make_mvc
Solution: Introduce $CI_FLAGS and use it to pass additional flags for
          the Github CI in order to treat size conversion warnings
          (C4267) as errors (Yegappan Lakshmanan)

closes: #17028

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

.github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b4a8cc..3c323a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -620,11 +620,13 @@
               DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
               DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
               DYNAMIC_PYTHON3_STABLE_ABI=%PYTHON3_STABLE% ^
-              DYNAMIC_SODIUM=yes SODIUM=%SODIUM_DIR%
+              DYNAMIC_SODIUM=yes SODIUM=%SODIUM_DIR% ^
+              CI_FLAGS=/we4267
           ) else (
             nmake -nologo -f Make_mvc.mak ^
               FEATURES=${{ matrix.features }} ^
-              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }}
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
+              CI_FLAGS=/we4267
           )
 
       - name: Build (MinGW)

ci/appveyor.bat

diff --git a/ci/appveyor.bat b/ci/appveyor.bat
index c77cee1..17d95ff 100644
--- a/ci/appveyor.bat
+++ b/ci/appveyor.bat
@@ -71,7 +71,7 @@
 echo "Building MSVC 64bit console Version"
 nmake -f Make_mvc.mak CPU=AMD64 ^
     OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-    FEATURES=%FEATURE%
+    FEATURES=%FEATURE% CI_CFLAGS=/we4267
 if not exist vim.exe (
     echo Build failure.
     exit 1
@@ -85,11 +85,11 @@
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
         PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
         PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
-        FEATURES=%FEATURE%
+        FEATURES=%FEATURE% CI_CFLAGS=/we4267
 ) ELSE (
     nmake -f Make_mvc.mak CPU=AMD64 ^
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
-        FEATURES=%FEATURE%
+        FEATURES=%FEATURE% CI_CFLAGS=/we4267
 )
 if not exist gvim.exe (
     echo Build failure.

src/Make_mvc.mak

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 2825865..ab6bd6c 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -533,7 +533,7 @@
 CFLAGS = -c /W3 /GF /nologo -I. -Iproto -DHAVE_PATHDEF -DWIN32 -DHAVE_STDINT_H \
 		$(CSCOPE_DEFS) $(TERM_DEFS) $(SOUND_DEFS) $(NETBEANS_DEFS) \
 		$(NBDEBUG_DEFS) $(XPM_DEFS) $(SOD_DEFS) $(SOD_INC) \
-		$(CHANNEL_DEFS) $(DEFINES) \
+		$(CHANNEL_DEFS) $(DEFINES) $(CI_CFLAGS) \
 		-DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
 		/source-charset:utf-8
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 42576d1..d1ba7ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1275,
+/**/
     1274,
 /**/
     1273,