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.
This commit is contained in:
Uoti Urpala 2008-12-02 20:09:35 +02:00
parent 10e4753998
commit a6af927ea1
2 changed files with 3 additions and 3 deletions

View File

@ -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:

View File

@ -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;