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. --- stream/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream') diff --git a/stream/stream.c b/stream/stream.c index 772c87dd9c..cb3679fbef 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -164,7 +164,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, if(sinfo->opts_url) { m_option_t url_opt = { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, (void *)sinfo->opts }; - if (m_option_parse(&url_opt, bstr("stream url"), bstr(filename), false, arg) < 0) { + if (m_option_parse(&url_opt, bstr0("stream url"), bstr0(filename), false, arg) < 0) { mp_tmsg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); m_struct_free(desc,arg); return NULL; -- cgit v1.2.3