summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorichizok <gclient.gaap@gmail.com>2023-04-18 17:20:08 +0100
committerBram Moolenaar <Bram@vim.org>2023-04-18 17:20:08 +0100
commit89f9ffbe810c4705439096d646681e734e353e3e (patch)
treea426d3ebd4f9794fc4332b2e40a07defbbccfe0a
parent6e5a9f948221b52caaaf106079cb3430c4dd7c77 (diff)
downloadvim-git-89f9ffbe810c4705439096d646681e734e353e3e.tar.gz
patch 9.0.1465: Haiku build failsv9.0.1465
Problem: Haiku build fails. Solution: Do not include globals.h and proto.h twice. (Ozaki Kiichi, closes #12273)
-rw-r--r--src/gui_haiku.cc2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc
index 6b035a5d2..15c4389f8 100644
--- a/src/gui_haiku.cc
+++ b/src/gui_haiku.cc
@@ -75,8 +75,6 @@ extern "C" {
#include <syslog.h>
#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 c050afec4..12deed26e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1465,
+/**/
1464,
/**/
1463,