On 12/11/14 20:43, Emil Velikov wrote: > On 12/11/14 06:03, Chad Versace wrote: >> From: Emil Velikov <[email protected]> >> >> Use the function pointers stored in wgbm_platform, to communicate >> with the library. >> >> Signed-off-by: Emil Velikov <[email protected]> >> Signed-off-by: Chad Versace <[email protected]> >> --- >> >> v2(chadv): Fix numerous upcast errors of form: >> >> src/waffle/gbm/wgbm_display.c: In function ‘wgbm_display_connect’: >> src/waffle/gbm/wgbm_display.c:121:12: warning: passing argument 1 of >> ‘wgbm_platform’ from incompatible pointer type [enabled by default] >> struct wgbm_platform *plat = wgbm_platform(wc_plat); >> ^ >> In file included from src/waffle/core/wcore_display.h:32:0, >> from src/waffle/egl/wegl_display.h:33, >> from src/waffle/gbm/wgbm_display.h:33, >> from src/waffle/gbm/wgbm_display.c:39: >> src/waffle/gbm/wgbm_platform.h:60:28: note: expected ‘struct >> wegl_platform *’ but argument is of type ‘struct wcore_platform *’ >> DEFINE_CONTAINER_CAST_FUNC(wgbm_platform, >> ^ >> src/waffle/core/wcore_util.h:44:5: note: in definition of macro >> ‘DEFINE_CONTAINER_CAST_FUNC’ >> func_name(member_type *member##_self) \ >> ^ >> > I'm pretty sure I've addressed those and taking a closer look it seems > to be a merge slip. > Actually it seems that I have pushed an old version of the branch, while sending out the correct patches.
I'll grab your patch, annotate everything and send you a pull request. Pardon for the noob mistake. Cheers Emil _______________________________________________ waffle mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/waffle
