summaryrefslogtreecommitdiffstats
path: root/m_config.h
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
committerwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
commit08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch)
treee6a6c3a2042231651ec2f622e312657da900280b /m_config.h
parentca0979a5db442ae212c92a34dcbd97101eb5e51c (diff)
downloadmpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.bz2
mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.xz
bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr
Replace all uses of bstr() with bstr0(). Also remove the ridiculous C++ workaround.
Diffstat (limited to 'm_config.h')
-rw-r--r--m_config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/m_config.h b/m_config.h
index 24e80eb538..623b754718 100644
--- a/m_config.h
+++ b/m_config.h
@@ -151,7 +151,7 @@ static inline int m_config_set_option0(struct m_config *config,
const char *name, const char *param,
bool ambiguous)
{
- return m_config_set_option(config, bstr(name), bstr(param), ambiguous);
+ return m_config_set_option(config, bstr0(name), bstr0(param), ambiguous);
}
/* Check if an option setting is valid.
@@ -164,7 +164,7 @@ static inline int m_config_check_option0(struct m_config *config,
const char *name, const char *param,
bool ambiguous)
{
- return m_config_check_option(config, bstr(name), bstr(param), ambiguous);
+ return m_config_check_option(config, bstr0(name), bstr0(param), ambiguous);
}
int m_config_parse_suboptions(struct m_config *config, void *optstruct,