# HG changeset patch # User Christian Brabandt # Date 1697623208 -7200 # Node ID b2075b2d2cca2b48d562d56f76fc30af41dc8422 # Parent 9390f81ff5e7fcb36f331ea93b2c8b92086c5caa patch 9.0.2046: win32,python: warning that MS_WIN64 got re-defined Commit: https://github.com/vim/vim/commit/436f39390f0a5d4c4877edcf69b469987d706f3c Author: Ken Takata 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 | : 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 Co-authored-by: Ken Takata diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- 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 ########################################################################### diff --git a/src/version.c b/src/version.c --- 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,