Mercurial > mplayer.hg

changeset 32063:bfd3e0d9ab9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move mconfig extern variable declaration to mpcommon.h.
author diego
date Sat, 11 Sep 2010 11:43:05 +0000
parents 734f9a57c186
children a735105a66b6
files asxparser.c mpcommon.h
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/asxparser.c	Sat Sep 11 11:38:36 2010 +0000
+++ b/asxparser.c	Sat Sep 11 11:43:05 2010 +0000
@@ -31,8 +31,7 @@
 #include "asxparser.h"
 #include "mp_msg.h"
 #include "m_config.h"
-
-extern m_config_t* mconfig;
+#include "mpcommon.h"
 
 ////// List utils
 
--- a/mpcommon.h	Sat Sep 11 11:38:36 2010 +0000
+++ b/mpcommon.h	Sat Sep 11 11:43:05 2010 +0000
@@ -19,6 +19,7 @@
 #ifndef MPLAYER_MPCOMMON_H
 #define MPLAYER_MPCOMMON_H
 
+#include "m_config.h"
 #include "m_option.h"
 #include "subreader.h"
 #include "libmpdemux/demuxer.h"
@@ -57,6 +58,7 @@
 extern const char *mencoder_version;
 extern const char *mplayer_version;
 
+extern m_config_t *mconfig;
 extern const m_option_t noconfig_opts[];
 
 void print_version(const char* name);