summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-09-11 14:56:52 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:46 +0200
commitbe67d71493c612bb385d68a0359edc4d7c4d8bbc (patch)
tree8bbcda18c2f503b0c9a26b99cd1cede522ebe4b4
parente02012a4af15ba3fb0a5317632413a37d6700c22 (diff)
downloadmpv-be67d71493c612bb385d68a0359edc4d7c4d8bbc.tar.bz2
mpv-be67d71493c612bb385d68a0359edc4d7c4d8bbc.tar.xz
loader: Move local_wm extern variable declaration to loader.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32161 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--loader/elfdll.c5
-rw-r--r--loader/loader.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/loader/elfdll.c b/loader/elfdll.c
index 057fa5b9c8..650596ebd1 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -18,6 +18,7 @@
#include "wine/debugtools.h"
#include "wine/winerror.h"
#include "debug.h"
+#include "loader.h"
#include "path.h"
//DEFAULT_DEBUG_CHANNEL(elfdll)
@@ -29,10 +30,6 @@
#include <dlfcn.h>
-//WINE_MODREF *local_wm=NULL;
-extern modref_list* local_wm;
-
-
/*------------------ HACKS -----------------*/
DWORD fixup_imports(WINE_MODREF *wm);
void dump_exports(HMODULE hModule);
diff --git a/loader/loader.h b/loader/loader.h
index 48778e1882..fa432e0294 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -19,6 +19,10 @@
#include "wine/mmreg.h"
#include "wine/vfw.h"
#include "wine/msacm.h"
+#include "wine/module.h"
+
+
+extern modref_list* local_wm;
unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, int default_value, const char* filename);
int GetPrivateProfileStringA_(const char* appname, const char* keyname,