Mercurial > vim

changeset 7530:5d1b5fd708c6 v7.4.1066

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/64496ffc9cfb0eb6f2074f22809de2b420b5f300 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 9 15:08:03 2016 +0100 patch 7.4.1066 Problem: Build fails on MS-Windows. Solution: Adjust the #ifdefs for "dll" options.
author Christian Brabandt <cb@256bit.org>
date Sat, 09 Jan 2016 15:15:03 +0100
parents 2066de3583f9
children 7311ca965f21
files src/option.h src/version.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/option.h
+++ b/src/option.h
@@ -627,7 +627,7 @@ EXTERN char_u	*p_lcs;		/* 'listchars' */
 
 EXTERN int	p_lz;		/* 'lazyredraw' */
 EXTERN int	p_lpl;		/* 'loadplugins' */
-#if defined(DYNAMIC_LUA) && !defined(WIN3264)
+#if defined(DYNAMIC_LUA)
 EXTERN char_u	*p_luadll;	/* 'luadll' */
 #endif
 #ifdef FEAT_GUI_MAC
@@ -686,13 +686,13 @@ EXTERN char_u	*p_path;	/* 'path' */
 #ifdef FEAT_SEARCHPATH
 EXTERN char_u	*p_cdpath;	/* 'cdpath' */
 #endif
-#if defined(DYNAMIC_PERL) && !defined(WIN3264)
+#if defined(DYNAMIC_PERL)
 EXTERN char_u	*p_perldll;	/* 'perldll' */
 #endif
-#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)
+#if defined(DYNAMIC_PYTHON3)
 EXTERN char_u	*p_py3dll;	/* 'pythonthreedll' */
 #endif
-#if defined(DYNAMIC_PYTHON) && !defined(WIN3264)
+#if defined(DYNAMIC_PYTHON)
 EXTERN char_u	*p_pydll;	/* 'pythondll' */
 #endif
 #ifdef FEAT_RELTIME
@@ -714,7 +714,7 @@ EXTERN int	p_rs;		/* 'restorescreen' */
 EXTERN int	p_ari;		/* 'allowrevins' */
 EXTERN int	p_ri;		/* 'revins' */
 #endif
-#if defined(DYNAMIC_RUBY) && !defined(WIN3264)
+#if defined(DYNAMIC_RUBY)
 EXTERN char_u	*p_rubydll;	/* 'rubydll' */
 #endif
 #ifdef FEAT_CMDL_INFO
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1066,
+/**/
     1065,
 /**/
     1064,