patch 9.1.1624: Cscope not enabled on MacOS

Problem:  Cscope not enabled on MacOS
Solution: Remove #ifdef test for MacOS and always enable FEAT_CSCOPE on
          Unix (Damien Lejay).

Remove the !MACOS_X guard from FEAT_CSCOPE in feature.h. macOS has been a
certified UNIX since 10.5 and supports cscope without issues. This guard
originated in the pre-OS X era when Classic MacOS lacked the required
POSIX APIs. MacVim already ships with +cscope successfully.

closes: #17976

Signed-off-by: Damien Lejay <damien@lejay.be>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/feature.h b/src/feature.h
index a87b9c2bbe3852e5bdc233b61fcb2cbfd679c1bb..e5df7fab7c8de9aacfc8cbebf8e0ce0cb1e87e08 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -236,7 +236,7 @@
 /*
  * +cscope             Unix only: Cscope support.
  */
-#if defined(UNIX) && defined(FEAT_HUGE) && defined(ENABLE_CSCOPE) && !defined(MACOS_X)
+#if defined(UNIX) && defined(FEAT_HUGE) && defined(ENABLE_CSCOPE)
 # define FEAT_CSCOPE
 #endif
 

diff --git a/src/version.c b/src/version.c
index 78cf50877d1b8e963432f9259047562ef142d114..22db56962e35235461f5aaaca14af06a1a37f3aa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1624,
 /**/
     1623,
 /**/