Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
a0027ec7
Commit
a0027ec7
authored
9 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
android: fix daemon build
Refs #74605 Change-Id: I5e21003083a765c9424fe370a1848074d391bfc1
parent
6648735a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
src/rational.h
+2
-0
2 additions, 0 deletions
src/rational.h
src/string_utils.h
+2
-2
2 additions, 2 deletions
src/string_utils.h
with
5 additions
and
3 deletions
configure.ac
+
1
−
1
View file @
a0027ec7
...
...
@@ -388,7 +388,7 @@ AS_IF([test "x$enable_video" != "xno"],
[
AC_DEFINE(RING_VIDEO, [], [Video support enabled])
AM_CONDITIONAL(RING_VIDEO, true)
AS_IF([test "$SYS" = linux],[
AS_IF([test "$SYS" = linux
&& test -z "${HAVE_ANDROID_FALSE}"
],[
PKG_CHECK_MODULES(UDEV, libudev,, AC_MSG_ERROR([Missing libudev development files]))
],[
])
...
...
This diff is collapsed.
Click to expand it.
src/rational.h
+
2
−
0
View file @
a0027ec7
...
...
@@ -31,7 +31,9 @@
#pragma once
#include
<utility>
// std::swap
#include
<cstdlib>
// std::abs
#include
<iostream>
namespace
ring
{
...
...
This diff is collapsed.
Click to expand it.
src/string_utils.h
+
2
−
2
View file @
a0027ec7
...
...
@@ -59,7 +59,7 @@ bool_to_str(bool b) noexcept
// We implement them by ourself as well as possible here.
template
<
typename
T
>
std
::
string
inline
std
::
string
to_string
(
T
&&
value
)
{
std
::
ostringstream
os
;
...
...
@@ -67,7 +67,7 @@ to_string(T &&value)
return
os
.
str
();
}
int
static
inline
int
stoi
(
const
std
::
string
&
str
)
{
int
v
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment