From 08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 28 Jul 2012 23:47:42 +0200 Subject: 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. --- m_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'm_config.h') 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, -- cgit v1.2.3