Commit 17f26347 authored by Olivier Teulière's avatar Olivier Teulière

* small compilation fixes for win32

parent 881768ad
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions * Collection of useful common types and macros definitions
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.40 2002/11/24 18:54:54 sam Exp $ * $Id: vlc_common.h,v 1.41 2002/11/25 03:12:42 ipkiss Exp $
* *
* Authors: Samuel Hocevar <sam@via.ecp.fr> * Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
*****************************************************************************/ *****************************************************************************/
#if defined( __BORLANDC__ ) #if defined( __BORLANDC__ )
# undef PACKAGE # undef PACKAGE
# undef HAVE_INTTYPES_H
#endif #endif
#include "config.h" #include "config.h"
...@@ -37,6 +36,7 @@ ...@@ -37,6 +36,7 @@
#if defined( __BORLANDC__ ) #if defined( __BORLANDC__ )
# undef HAVE_VARIADIC_MACROS # undef HAVE_VARIADIC_MACROS
# undef HAVE_STDINT_H # undef HAVE_STDINT_H
# undef HAVE_INTTYPES_H
#endif #endif
#include "vlc_config.h" #include "vlc_config.h"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* events.c: Windows DirectX video output events handler * events.c: Windows DirectX video output events handler
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: events.c,v 1.7 2002/11/22 15:24:10 sam Exp $ * $Id: events.c,v 1.8 2002/11/25 03:12:42 ipkiss Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -592,11 +592,11 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, ...@@ -592,11 +592,11 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
{ {
/* Store p_vout for future use */ /* Store p_vout for future use */
p_vout = (vout_thread_t *)((CREATESTRUCT *)lParam)->lpCreateParams; p_vout = (vout_thread_t *)((CREATESTRUCT *)lParam)->lpCreateParams;
SetWindowLong( hWnd, GWL_USERDATA, (LONG)p_vout ); SetWindowLong( hwnd, GWL_USERDATA, (LONG)p_vout );
} }
else else
{ {
p_vout = (vout_thread_t *)GetWindowLong( hWnd, GWL_USERDATA ); p_vout = (vout_thread_t *)GetWindowLong( hwnd, GWL_USERDATA );
} }
switch( message ) switch( message )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment