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
index 5879a0b2290679806ccaae6005a77485aa0ad115..87380c8e1d265f3063d628b75e010187f5b48b51 100644 (file)
--- 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 ffc29f062e27d72915f1b8a0a53431e63b085a49..6e2c94ff15e979603c968d7ed33722c2e7b1ac99 100644 (file)
--- 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 12ce7cbf594a24dd8a82dae6aa75a3c18e07cecf..f08bf1b2aaecebc020486e11da4c13cbaf6de12a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1416,
 /**/
     1415,
 /**/