Skip to content

Commit 669cac0

Browse files
committed
patch 7.4.1416
Problem: Using "u_char" intead of "char_u", which doesn't work everywhere. (Jörg Plate) Solution: Use "char_u" always.
1 parent f391327 commit 669cac0

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/integration.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ widgetIsIconified(
805805
if (XtWindow(w) != 0) { /* only check if window exists! */
806806
XGetWindowProperty(XtDisplay(w), XtWindow(w), wm_state, 0L, 2L,
807807
False, AnyPropertyType, &act_type, &act_fmt, &nitems_ret,
808-
&bytes_after, (u_char **) &property);
808+
&bytes_after, (char_u **) &property);
809809
if (nitems_ret == 2 && property[0] == IconicState) {
810810
return True;
811811
}

src/macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
#endif
120120

121121
/* Returns empty string if it is NULL. */
122-
#define EMPTY_IF_NULL(x) ((x) ? (x) : (u_char *)"")
122+
#define EMPTY_IF_NULL(x) ((x) ? (x) : (char_u *)"")
123123

124124
#ifdef FEAT_LANGMAP
125125
/*

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ static char *(features[]) =
748748

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1416,
751753
/**/
752754
1415,
753755
/**/

0 commit comments

Comments
 (0)