mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-06 07:15:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'array-const' into 'main'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
src/connection.c
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 *); args[i].o = va_arg(ap, struct wl_object *);
break; break;
case 'a': case 'a':
args[i].a = va_arg(ap, struct wl_array *); args[i].a = va_arg(ap, const struct wl_array *);
break; break;
case 'h': case 'h':
args[i].h = va_arg(ap, int32_t); args[i].h = va_arg(ap, int32_t);

2
src/scanner.c
View file

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

2
src/wayland-util.h
View file

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