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.
---
 input/input.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'input/input.c')

diff --git a/input/input.c b/input/input.c
index 014216e093..dbc29d964f 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1546,7 +1546,7 @@ int mp_input_get_key_from_name(const char *name)
     const char *p;
     while ((p = strchr(name, '+'))) {
         for (struct key_name *m = modifier_names; m->name; m++)
-            if (!bstrcasecmp(bstr(m->name),
+            if (!bstrcasecmp(bstr0(m->name),
                              (struct bstr){(char *)name, p - name})) {
                 modifiers |= m->key;
                 goto found;
@@ -1558,7 +1558,7 @@ found:
         name = p + 1;
     }
 
-    struct bstr bname = bstr(name);
+    struct bstr bname = bstr0(name);
 
     struct bstr rest;
     int code = bstr_decode_utf8(bname, &rest);
-- 
cgit v1.2.3