diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 20:09:35 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 20:15:45 +0200 |
| commit | a6af927ea17f5c5a882902653aa95488b87ea512 (patch) | |
| tree | ecad5a37e6c0ddd3a5584382aeeaa0d2511b7690 | |
| parent | 10e47539986deab2f0caf1fb8386043a9593796a (diff) | |
| download | mpv-a6af927ea17f5c5a882902653aa95488b87ea512.tar.bz2 mpv-a6af927ea17f5c5a882902653aa95488b87ea512.tar.xz | |
w32_common.c, vo_direct3d.c: Fix Windows compilation issues
In w32_common.c the special "old_vo_defines.h" header was included too
late. vo_direct3d.c was copied from svn without fixing the type of the
control() function.
| -rw-r--r-- | libvo/vo_direct3d.c | 2 | ||||
| -rw-r--r-- | libvo/w32_common.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index 1958fb45ca..4e3dc875cb 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -549,7 +549,7 @@ static int preinit(const char *arg) /** @brief libvo Callback: Handle control requests. * @return VO_TRUE on success, VO_NOTIMPL when not implemented */ -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { case VOCTRL_QUERY_FORMAT: diff --git a/libvo/w32_common.c b/libvo/w32_common.c index fd1fe5c36b..7f25182387 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -3,6 +3,8 @@ #include <windows.h> #include <windowsx.h> +// To get "#define vo_ontop global_vo->opts->vo_ontop" etc +#include "old_vo_defines.h" #include "osdep/keycodes.h" #include "input/input.h" #include "input/mouse.h" @@ -11,8 +13,6 @@ #include "aspect.h" #include "w32_common.h" #include "mp_fifo.h" -// To get "#define vo_ontop global_vo->opts->vo_ontop" etc -#include "old_vo_defines.h" extern int enable_mouse_movements; |