mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix name clash in RDP compositor

Browse Source 
This patch fixes some name clashes introduced by last patches.
This commit is contained in:
Hardening 2013-05-27 23:13:45 +02:00 committed by Kristian Høgsberg
parent 82189f7abd
commit 6a4e8c62e7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compositor-rdp.c
View File

@ -965,7 +965,7 @@ rdp_incoming_peer(freerdp_listener *instance, freerdp_peer *client)
static struct weston_compositor * static struct weston_compositor *
rdp_compositor_create(struct wl_display *display, rdp_compositor_create(struct wl_display *display,
struct rdp_compositor_config *config, struct rdp_compositor_config *config,
int *argc, char *argv[], struct weston_config *config) int *argc, char *argv[], struct weston_config *wconfig)
{ {
struct rdp_compositor *c; struct rdp_compositor *c;
char *fd_str; char *fd_str;
@ -977,7 +977,7 @@ rdp_compositor_create(struct wl_display *display,
memset(c, 0, sizeof *c); memset(c, 0, sizeof *c);
if (weston_compositor_init(&c->base, display, argc, argv, config) < 0) if (weston_compositor_init(&c->base, display, argc, argv, wconfig) < 0)
goto err_free; goto err_free;
c->base.destroy = rdp_destroy; c->base.destroy = rdp_destroy;
@ -1046,7 +1046,7 @@ err_free:
WL_EXPORT struct weston_compositor * WL_EXPORT struct weston_compositor *
backend_init(struct wl_display *display, int *argc, char *argv[], backend_init(struct wl_display *display, int *argc, char *argv[],
struct weston_config *config) struct weston_config *wconfig)
{ {
struct rdp_compositor_config config; struct rdp_compositor_config config;
rdp_compositor_config_init(&config); rdp_compositor_config_init(&config);
@ -1069,5 +1069,5 @@ backend_init(struct wl_display *display, int *argc, char *argv[],
}; };
parse_options(rdp_options, ARRAY_LENGTH(rdp_options), argc, argv); parse_options(rdp_options, ARRAY_LENGTH(rdp_options), argc, argv);
return rdp_compositor_create(display, &config, argc, argv, config); return rdp_compositor_create(display, &config, argc, argv, wconfig);
} }