Mercurial > mplayer.hg

changeset 32077:db0bb7511440

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move local_wm extern variable declaration to loader.h, which is better suited.
author diego
date Sat, 11 Sep 2010 14:56:52 +0000
parents 8ffbdf8429d8
children 0dfbb22d68c8
files loader/elfdll.c loader/loader.h
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/loader/elfdll.c	Sat Sep 11 14:43:06 2010 +0000
+++ b/loader/elfdll.c	Sat Sep 11 14:56:52 2010 +0000
@@ -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);
--- a/loader/loader.h	Sat Sep 11 14:43:06 2010 +0000
+++ b/loader/loader.h	Sat Sep 11 14:56:52 2010 +0000
@@ -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,