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 6b035a5d2c64b5aa0a35b9e243f31c12a9d8b8a3..15c4389f860bfb562514364839c040388abb1c56 100644 (file)
--- 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 c050afec4abc73c8367ad4594a6e75a1d8c98446..12deed26ef6a1e23cc6d9d21d3abcce1e2f8c1fe 100644 (file)
--- 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,
 /**/