patch 9.0.1059: build failure with some compilers

Problem:    Build failure with some compilers that can't handle a
            declaration directly after a "case" statement.
Solution:   Add a block to put the declarations in.

diff --git a/src/eval.c b/src/eval.c
index c0e9f76ade22c6605ce19f635ca13a97da97c682..286e5af2730d11d0265280a13d98a012e0b496a4 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -5874,32 +5874,36 @@ echo_string_core(
            break;
 
        case VAR_OBJECT:
-           garray_T ga;
-           ga_init2(&ga, 1, 50);
-           ga_concat(&ga, (char_u *)"object of ");
-           object_T *obj = tv->vval.v_object;
-           class_T *cl = obj == NULL ? NULL : obj->obj_class;
-           ga_concat(&ga, cl == NULL ? (char_u *)"[unknown]" : cl->class_name);
-           if (cl != NULL)
            {
-               ga_concat(&ga, (char_u *)" {");
-               for (int i = 0; i < cl->class_obj_member_count; ++i)
+               garray_T ga;
+               ga_init2(&ga, 1, 50);
+               ga_concat(&ga, (char_u *)"object of ");
+               object_T *obj = tv->vval.v_object;
+               class_T *cl = obj == NULL ? NULL : obj->obj_class;
+               ga_concat(&ga, cl == NULL ? (char_u *)"[unknown]"
+                                                            : cl->class_name);
+               if (cl != NULL)
                {
-                   if (i > 0)
-                       ga_concat(&ga, (char_u *)", ");
-                   objmember_T *m = &cl->class_obj_members[i];
-                   ga_concat(&ga, m->om_name);
-                   ga_concat(&ga, (char_u *)": ");
-                   char_u *tf = NULL;
-                   ga_concat(&ga, echo_string_core((typval_T *)(obj + 1) + i,
+                   ga_concat(&ga, (char_u *)" {");
+                   for (int i = 0; i < cl->class_obj_member_count; ++i)
+                   {
+                       if (i > 0)
+                           ga_concat(&ga, (char_u *)", ");
+                       objmember_T *m = &cl->class_obj_members[i];
+                       ga_concat(&ga, m->om_name);
+                       ga_concat(&ga, (char_u *)": ");
+                       char_u *tf = NULL;
+                       ga_concat(&ga, echo_string_core(
+                                              (typval_T *)(obj + 1) + i,
                                               &tf, numbuf, copyID, echo_style,
                                               restore_copyID, composite_val));
-                   vim_free(tf);
+                       vim_free(tf);
+                   }
+                   ga_concat(&ga, (char_u *)"}");
                }
-               ga_concat(&ga, (char_u *)"}");
-           }
 
-           *tofree = r = ga.ga_data;
+               *tofree = r = ga.ga_data;
+           }
            break;
 
        case VAR_FLOAT:

diff --git a/src/version.c b/src/version.c
index 4e15b9d8e83e00f38b6608596f379bf14d21c0c9..5d9ea5deb598bfec2351a671c5d91dd466713f40 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1059,
 /**/
     1058,
 /**/