RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

bstr.h: fix compilation with C++

This commit is contained in:
wm4 2012-08-03 03:23:44 +02:00
parent 772d93c81a
commit 719d126023
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bstr.h
View File

@ -45,11 +45,11 @@ static inline struct bstr bstrdup(void *talloc_ctx, struct bstr str)
{
struct bstr r = { NULL, str.len };
if (str.start)
r.start = talloc_memdup(talloc_ctx, str.start, str.len);
r.start = (unsigned char *)talloc_memdup(talloc_ctx, str.start, str.len);
return r;
}
static inline struct bstr bstr0(const unsigned char *s)
static inline struct bstr bstr0(const char *s)
{
return (struct bstr){(unsigned char *)s, s ? strlen(s) : 0};
}
@ -108,7 +108,7 @@ static inline struct bstr bstr_cut(struct bstr str, int n)
if (n < 0)
n = 0;
}
if (n > str.len)
if (((size_t)n) > str.len)
n = str.len;
return (struct bstr){str.start + n, str.len - n};
}