Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jean-Francois Dockes
upmpdcli
Commits
3285c910
Commit
3285c910
authored
Sep 02, 2020
by
Jean-Francois Dockes
Browse files
off by one on mhd MHD_Result change: it came in 0.9.71...
parent
5227e0f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/mediaserver/cdplugins/streamproxy.cpp
View file @
3285c910
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
#include <microhttpd.h>
#include <microhttpd.h>
#if MHD_VERSION < 0x00097000
#if MHD_VERSION <
=
0x00097000
#define MHD_Result int
#define MHD_Result int
#endif
#endif
...
...
src/smallut.cpp
View file @
3285c910
...
@@ -1404,8 +1404,11 @@ unsigned int stringToFlags(const vector<CharFlags>& flags,
...
@@ -1404,8 +1404,11 @@ unsigned int stringToFlags(const vector<CharFlags>& flags,
stringToTokens
(
input
,
toks
,
sep
);
stringToTokens
(
input
,
toks
,
sep
);
for
(
auto
&
tok
:
toks
)
{
for
(
auto
&
tok
:
toks
)
{
trimstring
(
tok
);
trimstring
(
tok
);
out
+=
std
::
accumulate
(
flags
.
begin
(),
flags
.
end
(),
out
,
out
=
std
::
accumulate
(
[
&
](
int
o
,
CharFlags
flag
){
return
tok
==
flag
.
yesname
?
o
|
flag
.
value
:
o
;
});
flags
.
begin
(),
flags
.
end
(),
out
,
[
&
](
unsigned
int
o
,
CharFlags
flag
)
{
return
tok
==
flag
.
yesname
?
o
|
flag
.
value
:
o
;
});
}
}
return
out
;
return
out
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment