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_struct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'm_struct.c')

diff --git a/m_struct.c b/m_struct.c
index 6e32bf32c8..f8bec673f5 100644
--- a/m_struct.c
+++ b/m_struct.c
@@ -71,7 +71,7 @@ int m_struct_set(const m_struct_t *st, void *obj, const char *field,
     return 0;
   }
 
-  if(f->type->parse(f, bstr(field), param, false, M_ST_MB_P(obj,f->p), NULL) < 0) {
+  if(f->type->parse(f, bstr0(field), param, false, M_ST_MB_P(obj,f->p), NULL) < 0) {
     mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s, field %s parsing error: %.*s\n",
 	   st->name, field, BSTR_P(param));
     return 0;
-- 
cgit v1.2.3