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.

1 files changed, 2 insertions, 2 deletions

diff --git a/mplayer.c b/mplayer.c
index 9001c221be..33a09f7a3b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1015,7 +1015,7 @@ static int libmpdemux_was_interrupted(struct MPContext *mpctx, int stop_play)
 
 static int playtree_add_playlist(struct MPContext *mpctx, play_tree_t *entry)
 {
-    play_tree_add_bpf(entry, bstr(mpctx->filename));
+    play_tree_add_bpf(entry, bstr0(mpctx->filename));
 
     {
         if (!entry) {
@@ -4212,7 +4212,7 @@ play_next_file:
             // The entry is added to the main playtree after the switch().
             break;
         case MP_CMD_LOADLIST:
-            entry = parse_playlist_file(mpctx->mconfig, bstr(cmd->args[0].v.s));
+            entry = parse_playlist_file(mpctx->mconfig, bstr0(cmd->args[0].v.s));
             break;
         case MP_CMD_QUIT:
             exit_player_with_rc(mpctx, EXIT_QUIT,