Commit: patch 9.1.0018: use of #if instead of #ifdef

1 view
Skip to first unread message

Christian Brabandt

unread,
Jan 12, 2024, 11:45:10 AM1/12/24
to vim...@googlegroups.com
patch 9.1.0018: use of #if instead of #ifdef

Commit: https://github.com/vim/vim/commit/b52600d5613316e5b6e89514a02df1f97e27a5ff
Author: Ken Takata <ken...@csc.jp>
Date: Fri Jan 12 17:31:07 2024 +0100

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 <ken...@csc.jp>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/gui.h b/src/gui.h
index 0a1d27414..1882000f6 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 3b51e0c8f..6d77deb45 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 f440140a4..675103fec 100644
--- 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,
/**/
Reply all
Reply to author
Forward
0 new messages