summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-19 13:14:30 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-19 13:14:30 +0100
commit6a2697ffd7e894861853b351689b0ddec8901c96 (patch)
tree01845ed85b8f32dfc2511700c15aac1ddf802adc
parentb4ff518d95aa57c2f8c0568c915035bef849581b (diff)
patch 7.4.923v7.4.923
Problem: Prototypes not always generated. Solution: Change #if to OR with PROTO.
-rw-r--r--src/version.c2
-rw-r--r--src/window.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c
index 73c1b8f64e..edfbca8fee 100644
--- 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 */
/**/
+ 923,
+/**/
922,
/**/
921,
diff --git a/src/window.c b/src/window.c
index 60d9ceb4f8..e8134e06a2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5580,7 +5580,7 @@ win_setminheight()
}
}
-#ifdef FEAT_MOUSE
+#if defined(FEAT_MOUSE) || defined(PROTO)
/*
* Status line of dragwin is dragged "offset" lines down (negative is up).
@@ -5713,7 +5713,7 @@ win_drag_status_line(dragwin, offset)
showmode();
}
-#ifdef FEAT_VERTSPLIT
+# if defined(FEAT_VERTSPLIT) || defined(PROTO)
/*
* Separator line of dragwin is dragged "offset" lines right (negative is left).
*/
@@ -5816,7 +5816,7 @@ win_drag_vsep_line(dragwin, offset)
(void)win_comp_pos();
redraw_all_later(NOT_VALID);
}
-#endif /* FEAT_VERTSPLIT */
+# endif /* FEAT_VERTSPLIT */
#endif /* FEAT_MOUSE */
#endif /* FEAT_WINDOWS */
@@ -7268,7 +7268,7 @@ get_tab_number(tabpage_T *tp UNUSED)
}
#endif
-#ifdef FEAT_WINDOWS
+#if defined(FEAT_WINDOWS) || defined(PROTO)
/*
* Return TRUE if "topfrp" and its children are at the right height.
*/
@@ -7291,7 +7291,7 @@ frame_check_height(topfrp, height)
}
#endif
-#ifdef FEAT_VERTSPLIT
+#if defined(FEAT_VERTSPLIT) || defined(PROTO)
/*
* Return TRUE if "topfrp" and its children are at the right width.
*/