summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-06 13:35:08 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-06 13:35:08 +0200
commit254e028e907d8f261f8911242eb0ca5d04276b93 (patch)
tree2938b73e9b0b4d6ee234996877ba78e569583f70
parent91aeaf4cce8d534a1bdd6a2ceeba759e83952ab0 (diff)
downloadvim-git-254e028e907d8f261f8911242eb0ca5d04276b93.tar.gz
updated for version 7.3.1313v7.3.1313
Problem: :py and :py3 don't work when compiled with Cygwin or MingW with 64 bit. Solution: Add -DMS_WIN64 to the build command. (Ken Takata)
-rw-r--r--src/Make_cyg.mak3
-rw-r--r--src/Make_ming.mak3
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 68c44f0f8..f955b4d03 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -118,6 +118,9 @@ endif
DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \
-DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
+ifeq ($(ARCH),x86-64)
+DEFINES+=-DMS_WIN64
+endif
INCLUDES = -march=$(ARCH) -Iproto
#>>>>> name of the compiler and linker, name of lib directory
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 45d903f5f..7aa3994d4 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -328,6 +328,9 @@ endif # RUBY
DEF_GUI=-DFEAT_GUI_W32 -DFEAT_CLIPBOARD
DEFINES=-DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
-DHAVE_PATHDEF -DFEAT_$(FEATURES)
+ifeq ($(ARCH),x86-64)
+DEFINES+=-DMS_WIN64
+endif
ifeq ($(CROSS),yes)
# cross-compiler prefix:
CROSS_COMPILE = i586-pc-mingw32msvc-
diff --git a/src/version.c b/src/version.c
index 4d9af6855..9a9a39dae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1313,
+/**/
1312,
/**/
1311,