changeset 33605:b2075b2d2cca v9.0.2046

patch 9.0.2046: win32,python: warning that MS_WIN64 got re-defined Commit: https://github.com/vim/vim/commit/436f39390f0a5d4c4877edcf69b469987d706f3c Author: Ken Takata <kentkt@csc.jp> Date: Wed Oct 18 11:53:30 2023 +0200 patch 9.0.2046: win32,python: warning that MS_WIN64 got re-defined Problem: win32,python: warning that MS_WIN64 got re-defined Solution: Do not define MS_WIN64, as it is no longer used Suppress the following warning: ``` In file included from C:/Python312-64/include/Python.h:12, from if_python3.c:79: C:/Python312-64/include/pyconfig.h:240: warning: "MS_WIN64" redefined 240 | #define MS_WIN64 | <command-line>: note: this is the location of the previous definition ``` `MS_WIN64` is not defined in `Make_mvc.mak` either. This should be able to be safely removed. closes: #13370 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Ken Takata <kentkt@csc.jp>
author Christian Brabandt <cb@256bit.org>
date Wed, 18 Oct 2023 12:00:08 +0200
parents 9390f81ff5e7
children 8fcffc1144ff
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -513,9 +513,6 @@ endif # RUBY
 DEF_GUI=-DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD
 DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
 	-DHAVE_PATHDEF -DFEAT_$(FEATURES) -DHAVE_STDINT_H
-ifeq ($(ARCH),x86-64)
-DEFINES+=-DMS_WIN64
-endif
 
 #>>>>> end of choices
 ###########################################################################
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2046,
+/**/
     2045,
 /**/
     2044,