summaryrefslogtreecommitdiffstats
path: root/bstr.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-12 10:17:55 +0200
committerwm4 <wm4@nowhere>2012-10-12 11:53:53 +0200
commit85d185441acf4691c830db2f40235ac927410d45 (patch)
tree211177793cd5d6b399346be661af8e7528f0f411 /bstr.h
parent65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff)
parente1b15dee4c250bf6509594e241eb2856c8d21e0f (diff)
downloadmpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2
mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz
Merge branch 'input_changes' into master
Conflicts: DOCS/man/en/vo.rst etc/input.conf input/input.c m_property.c
Diffstat (limited to 'bstr.h')
-rw-r--r--bstr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/bstr.h b/bstr.h
index fab9be5814..dfe6f3a556 100644
--- a/bstr.h
+++ b/bstr.h
@@ -162,7 +162,7 @@ static inline int bstr_find0(struct bstr haystack, const char *needle)
return bstr_find(haystack, bstr0(needle));
}
-static inline int bstr_eatstart0(struct bstr *s, char *prefix)
+static inline int bstr_eatstart0(struct bstr *s, const char *prefix)
{
return bstr_eatstart(s, bstr0(prefix));
}