diff options
| -rw-r--r-- | src/integration.c | 2 | ||||
| -rw-r--r-- | src/macros.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/integration.c b/src/integration.c index 5879a0b22..87380c8e1 100644 --- a/src/integration.c +++ b/src/integration.c @@ -805,7 +805,7 @@ widgetIsIconified( if (XtWindow(w) != 0) { /* only check if window exists! */ XGetWindowProperty(XtDisplay(w), XtWindow(w), wm_state, 0L, 2L, False, AnyPropertyType, &act_type, &act_fmt, &nitems_ret, - &bytes_after, (u_char **) &property); + &bytes_after, (char_u **) &property); if (nitems_ret == 2 && property[0] == IconicState) { return True; } diff --git a/src/macros.h b/src/macros.h index ffc29f062..6e2c94ff1 100644 --- a/src/macros.h +++ b/src/macros.h @@ -119,7 +119,7 @@ #endif /* Returns empty string if it is NULL. */ -#define EMPTY_IF_NULL(x) ((x) ? (x) : (u_char *)"") +#define EMPTY_IF_NULL(x) ((x) ? (x) : (char_u *)"") #ifdef FEAT_LANGMAP /* diff --git a/src/version.c b/src/version.c index 12ce7cbf5..f08bf1b2a 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1416, +/**/ 1415, /**/ 1414, |