# HG changeset patch # User Christian Brabandt # Date 1452348903 -3600 # Node ID 5d1b5fd708c6c4e9c1dbef11be15c1db1207c0be # Parent 2066de3583f9161090bc7b52b2e89fec1b6c2605 commit https://github.com/vim/vim/commit/64496ffc9cfb0eb6f2074f22809de2b420b5f300 Author: Bram Moolenaar 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. diff --git a/src/option.h b/src/option.h --- 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 --- 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,