Skip to content

Commit 9a0aa2a

Browse files
Fix compilation issues
1) when building for android 2) when building without wayland
1 parent 159a114 commit 9a0aa2a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/detection/displayserver/wayland.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ void ffdsConnectWayland(const FFinstance* instance, FFDisplayServerResult* resul
160160
#ifdef FF_HAVE_WAYLAND
161161
if(detectWayland(instance, result))
162162
return;
163+
#else
164+
FF_UNUSED(instance);
163165
#endif
164166

165167
const char* xdgSessionType = getenv("XDG_SESSION_TYPE");

src/detection/os.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
#include <stdlib.h>
88
#include <pthread.h>
99

10-
#if !defined(__ANDROID__)
10+
#if __ANDROID__
11+
#include "common/settings.h"
12+
#else
1113

1214
static bool parseFile(const char* fileName, FFOSResult* result)
1315
{

0 commit comments

Comments
 (0)