summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui.h2
-rw-r--r--src/structs.h2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gui.h b/src/gui.h
index 0a1d274140..1882000f6b 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -176,7 +176,7 @@ typedef struct GuiScrollbar
// to reduce the count.
#endif
-#if FEAT_GUI_HAIKU
+#ifdef FEAT_GUI_HAIKU
VimScrollBar *id; // Pointer to real scroll bar
#endif
#ifdef FEAT_GUI_PHOTON
diff --git a/src/structs.h b/src/structs.h
index 3b51e0c8f1..6d77deb454 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4333,7 +4333,7 @@ struct VimMenu
HMENU submenu_id; // If this is submenu, add children here
HWND tearoff_handle; // hWnd of tearoff if created
#endif
-#if FEAT_GUI_HAIKU
+#ifdef FEAT_GUI_HAIKU
BMenuItem *id; // Id of menu item
BMenu *submenu_id; // If this is submenu, add children here
# ifdef FEAT_TOOLBAR
diff --git a/src/version.c b/src/version.c
index f440140a4b..675103fecd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 18,
+/**/
17,
/**/
16,