From 08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@mplayer2.org>
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_property.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'm_property.c')

diff --git a/m_property.c b/m_property.c
index 762ad73b7d..6eaaf92eeb 100644
--- a/m_property.c
+++ b/m_property.c
@@ -108,7 +108,7 @@ int m_property_do(const m_option_t *prop_list, const char *name,
         if (!arg)
             return M_PROPERTY_ERROR;
         val = calloc(1, opt->type->size);
-        if ((r = m_option_parse(opt, bstr(opt->name), bstr(arg), false,
+        if ((r = m_option_parse(opt, bstr0(opt->name), bstr0(arg), false,
                 val)) <= 0) {
             free(val);
             return r;
-- 
cgit v1.2.3