]> granicus.if.org Git - vim/commitdiff
patch 8.1.0659: build failure without the sign feature v8.1.0659
authorBram Moolenaar <Bram@vim.org>
Sat, 29 Dec 2018 19:04:40 +0000 (20:04 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 29 Dec 2018 19:04:40 +0000 (20:04 +0100)
Problem:    Build failure without the sign feature.
Solution:   Put the sign struct declarations outside of the #ifdef.

src/structs.h
src/version.c

index ae1c12e810ca41bca150b9c221f7b7e50c92b5b0..4ac98b18a8b83eb6a1f658da0d705ace65cae83f 100644 (file)
@@ -731,8 +731,6 @@ typedef struct proptype_S
 #define PT_FLAG_INS_START_INCL 1       // insert at start included in property
 #define PT_FLAG_INS_END_INCL   2       // insert at end included in property
 
-
-#if defined(FEAT_SIGNS) || defined(PROTO)
 // Sign group
 typedef struct signgroup_S
 {
@@ -741,10 +739,6 @@ typedef struct signgroup_S
     char_u     sg_name[1];             // sign group name
 } signgroup_T;
 
-// Macros to get the sign group structure from the group name
-#define SGN_KEY_OFF    offsetof(signgroup_T, sg_name)
-#define HI2SG(hi)      ((signgroup_T *)((hi)->hi_key - SGN_KEY_OFF))
-
 typedef struct signlist signlist_T;
 
 struct signlist
@@ -758,6 +752,11 @@ struct signlist
     signlist_T  *prev;         /* previous entry -- for easy reordering */
 };
 
+#if defined(FEAT_SIGNS) || defined(PROTO)
+// Macros to get the sign group structure from the group name
+#define SGN_KEY_OFF    offsetof(signgroup_T, sg_name)
+#define HI2SG(hi)      ((signgroup_T *)((hi)->hi_key - SGN_KEY_OFF))
+
 // Default sign priority for highlighting
 #define SIGN_DEF_PRIO  10
 
index 1772cfdc80a7bcf2ef3142cfbafcc939eb104b98..e76bf4bd8c71d0f0d50857c25f3f2bf2aa942d86 100644 (file)
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    659,
 /**/
     658,
 /**/