patch 7.4.1066

Problem:    Build fails on MS-Windows.
Solution:   Adjust the #ifdefs for "dll" options.

diff --git a/src/option.h b/src/option.h
index 7da6b8aed257d3607fa55e9289d526430314ab39..af5b988963abef9dae68c61390d55d16590fb16e 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 4d791d01cd6c3648e1ef1e5a1d32c75c7b558f70..3cddb0e31b6c301f19b0997e3185a495e3e97451 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1066,
 /**/
     1065,
 /**/