misc: little compile fix + add android branch to Makefile CI

Toni500github · Dec 5, 2024 · a759ec7 · a759ec7
1 parent a8a3737
commit a759ec7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -2,9 +2,9 @@ name: Makefile CI (Test customfetch NOGUI)
 
 on:
   push:
-    branches: [ "main", "test", "windows" ]
+    branches: [ "main", "test", "android" ]
   pull_request:
-    branches: [ "main", "test", "windows" ]
+    branches: [ "main", "test", "android" ]
 
 jobs:
   build-deb:

diff --git a/src/main.cpp b/src/main.cpp
@@ -349,7 +349,7 @@ system
 // clang-format off
 // parseargs() but only for parsing the user config path trough args
 // and so we can directly construct Config
-static STRING_IF_ANDROID_APP_ELSE(bool) parse_config_path(int argc, char* argv[], const std::string& configDir)
+static std::string parse_config_path(int argc, char* argv[], const std::string& configDir)
 {
     int opt = 0;
     int option_index = 0;
@@ -638,4 +638,4 @@ int main(int argc, char *argv[])
 #endif // !ANDROID_APP
 
     return _false; // 0 or "false"
-}
+}