From 4d6d2665219d7a8c5b975001b7a4e121066e92f9 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 21 Feb 2010 22:14:11 +0000
Subject: Only #define WIN32_LOADER if it has not been #defined already, fixes
 warning: loader/win32.c:27:1: warning: "WIN32_LOADER" redefined

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30689 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 loader/win32.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'loader')

diff --git a/loader/win32.c b/loader/win32.c
index b2e88a5a6d..3174c4e17d 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -24,7 +24,9 @@ for DLL to know too much about its environment.
 
 /* Hack to make sure the correct function declaration in com.h is used when
  * this file is built for the test applications with WIN32_LOADER disabled. */
+#ifndef WIN32_LOADER
 #define WIN32_LOADER
+#endif
 
 #ifdef CONFIG_QTX_CODECS
 #define PSEUDO_SCREEN_WIDTH	/*640*/800
-- 
cgit v1.2.3


From 289697dc5012478e3d46407378c2bafa26442c3b Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 21 Feb 2010 23:33:03 +0000
Subject: Add public function VideoForWindowsVersion() to the appropriate
 header file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30693 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 loader/wine/vfw.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'loader')

diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h
index 7bf72be42d..89c76c3ef2 100644
--- a/loader/wine/vfw.h
+++ b/loader/wine/vfw.h
@@ -207,6 +207,9 @@ typedef struct {
     void*		lpPrev;
 } ICCOMPRESS;
 
+
+long VFWAPI VideoForWindowsVersion(void);
+
 long VFWAPIV ICCompress(
 	HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpData,
 	LPBITMAPINFOHEADER lpbiInput,void* lpBits,long* lpckid,
-- 
cgit v1.2.3