Skip to content
Snippets Groups Projects
Commit a0027ec7 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

android: fix daemon build

Refs #74605

Change-Id: I5e21003083a765c9424fe370a1848074d391bfc1
parent 6648735a
No related branches found
No related tags found
No related merge requests found
...@@ -388,7 +388,7 @@ AS_IF([test "x$enable_video" != "xno"], ...@@ -388,7 +388,7 @@ AS_IF([test "x$enable_video" != "xno"],
[ [
AC_DEFINE(RING_VIDEO, [], [Video support enabled]) AC_DEFINE(RING_VIDEO, [], [Video support enabled])
AM_CONDITIONAL(RING_VIDEO, true) 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])) PKG_CHECK_MODULES(UDEV, libudev,, AC_MSG_ERROR([Missing libudev development files]))
],[ ],[
]) ])
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#pragma once #pragma once
#include <utility> // std::swap
#include <cstdlib> // std::abs #include <cstdlib> // std::abs
#include <iostream>
namespace ring { namespace ring {
......
...@@ -59,7 +59,7 @@ bool_to_str(bool b) noexcept ...@@ -59,7 +59,7 @@ bool_to_str(bool b) noexcept
// We implement them by ourself as well as possible here. // We implement them by ourself as well as possible here.
template <typename T> template <typename T>
std::string inline std::string
to_string(T &&value) to_string(T &&value)
{ {
std::ostringstream os; std::ostringstream os;
...@@ -67,7 +67,7 @@ to_string(T &&value) ...@@ -67,7 +67,7 @@ to_string(T &&value)
return os.str(); return os.str();
} }
int static inline int
stoi(const std::string& str) stoi(const std::string& str)
{ {
int v; int v;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment