From a7bc7d8e63e15455b350ceb8683ab5d1581f524d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 14 Jun 2010 14:35:57 +0000
Subject: [PATCH] cleanup: #include loader/wine/winbase.h instead of local
 declarations

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31414 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/ad_qtaudio.c | 5 +----
 libmpcodecs/vd_qtvideo.c | 4 +---
 libmpcodecs/ve_qtvideo.c | 5 ++---
 libmpdemux/demux_avs.c   | 5 +----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
index fb308c2d2c..d171c1620c 100644
--- a/libmpcodecs/ad_qtaudio.c
+++ b/libmpcodecs/ad_qtaudio.c
@@ -30,6 +30,7 @@
 #include <QuickTime/QuickTimeComponents.h>
 #else
 #include "loader/ldt_keeper.h"
+#include "loader/wine/winbase.h"
 #include "loader/wine/windef.h"
 #endif
 
@@ -95,10 +96,6 @@ static LPFUNC9 SoundConverterBeginConversion;
 
 #define siDecompressionParams 2002876005 // siDecompressionParams = FOUR_CHAR_CODE('wave')
 
-HMODULE   WINAPI LoadLibraryA(LPCSTR);
-FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
-int       WINAPI FreeLibrary(HMODULE);
-
 static int loader_init(void)
 {
 
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index 18c769e32c..6032a57f8d 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -31,6 +31,7 @@
 #else
 #include "loader/ldt_keeper.h"
 #include "loader/qtx/qtxsdk/components.h"
+#include "loader/wine/winbase.h"
 #include "loader/wine/windef.h"
 #endif
 
@@ -52,9 +53,6 @@ static ImageDescriptionHandle framedescHandle;
 static ImageSequence imageSeq;
 
 #ifndef CONFIG_QUICKTIME
-HMODULE   WINAPI LoadLibraryA(LPCSTR);
-FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
-int       WINAPI FreeLibrary(HMODULE);
 static    HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
 static    HMODULE handler;
 static    OSErr (*InitializeQTML)(long flags);
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index a6773e31ca..59b8731c93 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "loader/qtx/qtxsdk/components.h"
+#include "loader/wine/winbase.h"
 #include "loader/wine/windef.h"
 
 #include "codec-cfg.h"
@@ -49,9 +50,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-HMODULE   WINAPI LoadLibraryA(LPCSTR);
-FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
-int       WINAPI FreeLibrary(HMODULE);
+
 static HINSTANCE qtime_qts; //handle to preloaded quicktime.qts
 static HMODULE handler;
 
diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c
index 94d1b80330..33fc01ab0d 100644
--- a/libmpdemux/demux_avs.c
+++ b/libmpdemux/demux_avs.c
@@ -32,6 +32,7 @@
 #include "stheader.h"
 #include "libvo/fastmemcpy.h"
 
+#include "loader/wine/winbase.h"
 #include "loader/wine/windef.h"
 
 #ifdef WIN32_LOADER
@@ -42,10 +43,6 @@
 
 #define MAX_AVS_SIZE    16 * 1024 /* 16k should be enough */
 
-HMODULE WINAPI LoadLibraryA(LPCSTR);
-FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
-int     WINAPI FreeLibrary(HMODULE);
-
 typedef WINAPI AVS_ScriptEnvironment* (*imp_avs_create_script_environment)(int version);
 typedef WINAPI AVS_Value (*imp_avs_invoke)(AVS_ScriptEnvironment *, const char * name, AVS_Value args, const char** arg_names);
 typedef WINAPI const AVS_VideoInfo *(*imp_avs_get_video_info)(AVS_Clip *);