patch 9.1.0018: use of #if instead of #ifdef

Problem:  use of #if instead of #ifdef
Solution: use correct form of #ifdef

`#if FEAT_GUI_HAIKU` was used mistakenly. Use the correct form
`#ifdef FEAT_GUI_HAIKU` instead.

closes: #13843

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui.h b/src/gui.h
index 0a1d274140ed9c931ae538a087f0e8e6afd2aeca..1882000f6b8dd8119239755cef7ae06bee01f432 100644 (file)
--- 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 3b51e0c8f18b7f8297a359eeaba87441f115028b..6d77deb45462836295814d84c9f547cd37da3a7d 100644 (file)
--- 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 f440140a4b2596e4b84d518fc736aabc47b3c3bc..675103fecdfba14602c596e08c2571c9ce24a876 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    18,
 /**/
     17,
 /**/