[vlc-devel] commit: Revert "vout_window_t: simplify via anynomous union" ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 30 17:22:25 2010 +0200| [8cf3097c11fc14bf254bb5595d70d601fb6188b7] | committer: Rémi Denis-Courmont 

Revert "vout_window_t: simplify via anynomous union"

This reverts commit ec4682128ada4047b20763dd94a7ed63c9de3d55.

Conflicts:

	modules/gui/qt4/qt4.cpp
	modules/video_output/msw/events_vo.c
	modules/video_output/x11/xcommon.c
	modules/video_output/xcb/common.c
	modules/video_output/xcb/window.c
	src/video_output/window.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8cf3097c11fc14bf254bb5595d70d601fb6188b7
---

 include/vlc_vout_window.h            |    2 +-
 modules/gui/hildon/maemo.c           |    6 +++---
 modules/gui/qt4/qt4.cpp              |    8 ++++----
 modules/gui/skins2/src/skin_main.cpp |    4 ++--
 modules/video_output/drawable.c      |    2 +-
 modules/video_output/msw/events.c    |    2 +-
 modules/video_output/omapfb.c        |    4 ++--
 modules/video_output/xcb/common.c    |    4 ++--
 modules/video_output/xcb/events.c    |    2 +-
 modules/video_output/xcb/glx.c       |   11 ++++++-----
 modules/video_output/xcb/window.c    |   16 ++++++++--------
 modules/video_output/xcb/x11.c       |    4 ++--
 modules/video_output/xcb/xvideo.c    |    6 +++---
 src/video_output/window.c            |    6 +++---
 14 files changed, 39 insertions(+), 38 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=8cf3097c11fc14bf254bb5595d70d601fb6188b7