aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0659: build failure without the sign feature

Browse Source 
Problem:    Build failure without the sign feature.
Solution:   Put the sign struct declarations outside of the #ifdef.
This commit is contained in:
Bram Moolenaar 2018-12-29 20:04:40 +01:00
parent 7d83bf4f2b
commit ced198d4b4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/structs.h
View 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_START_INCL 1 // insert at start included in property
#define PT_FLAG_INS_END_INCL 2 // insert at end included in property #define PT_FLAG_INS_END_INCL 2 // insert at end included in property
#if defined(FEAT_SIGNS) || defined(PROTO)
// Sign group // Sign group
typedef struct signgroup_S typedef struct signgroup_S
{ {
@ -741,10 +739,6 @@ typedef struct signgroup_S
char_u sg_name[1]; // sign group name char_u sg_name[1]; // sign group name
} signgroup_T; } 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; typedef struct signlist signlist_T;
struct signlist struct signlist
@ -758,6 +752,11 @@ struct signlist
signlist_T *prev; /* previous entry -- for easy reordering */ 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 // Default sign priority for highlighting
#define SIGN_DEF_PRIO 10 #define SIGN_DEF_PRIO 10

2
src/version.c
View File

@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
659,
/**/ /**/
658, 658,
/**/ /**/