# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1456410605 -3600
# Node ID 6ee794dc950ebd6bb05d741a50e660b5ff125c56
# Parent  f16bfe02cef13816bdcc5ed225d16b1975abecd9
commit https://github.com/vim/vim/commit/669cac0a805333e69b9e1176425083914eada659
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Feb 25 15:25:03 2016 +0100

    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.

diff --git a/src/integration.c b/src/integration.c
--- 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
--- 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
--- 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,