Merge branch 'array-const' into 'main'

WIP: make wl_array arguments const

See merge request wayland/wayland!107
This commit is contained in:
Simon Ser 2024-03-04 23:36:07 +00:00
commit c30a783078
3 changed files with 3 additions and 3 deletions

View file

@ -524,7 +524,7 @@ wl_argument_from_va_list(const char *signature, union wl_argument *args,
args[i].o = va_arg(ap, struct wl_object *);
break;
case 'a':
args[i].a = va_arg(ap, struct wl_array *);
args[i].a = va_arg(ap, const struct wl_array *);
break;
case 'h':
args[i].h = va_arg(ap, int32_t);

View file

@ -1120,7 +1120,7 @@ emit_type(struct arg *a)
printf("struct %s *", a->interface_name);
break;
case ARRAY:
printf("struct wl_array *");
printf("const struct wl_array *");
break;
}
}

View file

@ -681,7 +681,7 @@ union wl_argument {
const char *s; /**< `string` */
struct wl_object *o; /**< `object` */
uint32_t n; /**< `new_id` */
struct wl_array *a; /**< `array` */
const struct wl_array *a; /**< `array` */
int32_t h; /**< `fd` */
};