From: ichizok Date: Tue, 18 Apr 2023 16:20:08 +0000 (+0100) Subject: patch 9.0.1465: Haiku build fails X-Git-Tag: v9.0.1465 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89f9ffbe810c4705439096d646681e734e353e3e;p=thirdparty%2Fvim.git patch 9.0.1465: Haiku build fails Problem: Haiku build fails. Solution: Do not include globals.h and proto.h twice. (Ozaki Kiichi, closes #12273) --- diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc index 6b035a5d2c..15c4389f86 100644 --- a/src/gui_haiku.cc +++ b/src/gui_haiku.cc @@ -75,8 +75,6 @@ extern "C" { #include #include "vim.h" -#include "globals.h" -#include "proto.h" #include "version.h" } // extern "C" diff --git a/src/version.c b/src/version.c index c050afec4a..12deed26ef 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1465, /**/ 1464, /**/