diff options
author | wm4 <wm4@mplayer2.org> | 2012-05-20 11:42:44 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-05-20 11:42:44 +0200 |
commit | 2793e7eb70a342b346788f83e1ed660c8e0d491e (patch) | |
tree | fe62d4ab03de24c568244b66f10990e09af3a370 /m_config.h | |
parent | 4488583dda2754a2e71ec991e9541bcc2c259da3 (diff) | |
parent | f63dbaddb6de6add6d987dc28ca8771aca230451 (diff) | |
download | mpv-2793e7eb70a342b346788f83e1ed660c8e0d491e.tar.bz2 mpv-2793e7eb70a342b346788f83e1ed660c8e0d491e.tar.xz |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'm_config.h')
-rw-r--r-- | m_config.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/m_config.h b/m_config.h index 91ee7ffe43..ff54aae8b2 100644 --- a/m_config.h +++ b/m_config.h @@ -95,6 +95,7 @@ typedef struct m_config { int profile_depth; void *optstruct; // struct mpopts or other + int (*includefunc)(struct m_config *conf, char *filename); } m_config_t; @@ -107,7 +108,7 @@ typedef struct m_config { // Create a new config object. struct m_config * m_config_new(void *optstruct, - int includefunc(struct m_option *conf, char *filename)); + int includefunc(struct m_config *conf, char *filename)); // Free a config object. void m_config_free(struct m_config *config); @@ -151,7 +152,7 @@ static inline int m_config_set_option0(struct m_config *config, /* Check if an option setting is valid. * Same as above m_config_set_option() but doesn't actually set anything. */ -int m_config_check_option(const struct m_config *config, struct bstr name, +int m_config_check_option(struct m_config *config, struct bstr name, struct bstr param, bool ambiguous_param); static inline int m_config_check_option0(struct m_config *config, |