diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt index 5d5509d239..c463757e3f 100644 --- a/wpinet/CMakeLists.txt +++ b/wpinet/CMakeLists.txt @@ -202,7 +202,7 @@ foreach(example ${wpinet_examples}) endif() endforeach() -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT ANDROID) set(LIBUTIL -lutil) else() set(LIBUTIL) diff --git a/wpinet/examples/dsclient/dsclient.cpp b/wpinet/examples/dsclient/dsclient.cpp index 7f8b74e36d..087743482e 100644 --- a/wpinet/examples/dsclient/dsclient.cpp +++ b/wpinet/examples/dsclient/dsclient.cpp @@ -32,5 +32,5 @@ int main() { }); // wait for a keypress to terminate - std::getchar(); + static_cast(std::getchar()); } diff --git a/wpinet/examples/parallelconnect/parallelconnect.cpp b/wpinet/examples/parallelconnect/parallelconnect.cpp index adcc74e462..f01e53450b 100644 --- a/wpinet/examples/parallelconnect/parallelconnect.cpp +++ b/wpinet/examples/parallelconnect/parallelconnect.cpp @@ -48,5 +48,5 @@ int main() { }); // wait for a keypress to terminate - std::getchar(); + static_cast(std::getchar()); } diff --git a/wpinet/examples/webserver/webserver.cpp b/wpinet/examples/webserver/webserver.cpp index 0579c3fd65..9fe29097b6 100644 --- a/wpinet/examples/webserver/webserver.cpp +++ b/wpinet/examples/webserver/webserver.cpp @@ -85,5 +85,5 @@ int main() { }); // wait for a keypress to terminate - std::getchar(); + static_cast(std::getchar()); } diff --git a/wpiutil/src/main/native/unix/StackTrace.cpp b/wpiutil/src/main/native/unix/StackTrace.cpp index c0d9e54658..cc753c26b9 100644 --- a/wpiutil/src/main/native/unix/StackTrace.cpp +++ b/wpiutil/src/main/native/unix/StackTrace.cpp @@ -16,6 +16,7 @@ namespace wpi { std::string GetStackTraceDefault(int offset) { +#ifndef __ANDROID__ void* stackTrace[128]; int stackSize = backtrace(stackTrace, 128); char** mangledSymbols = backtrace_symbols(stackTrace, stackSize); @@ -38,6 +39,10 @@ std::string GetStackTraceDefault(int offset) { std::free(mangledSymbols); return std::string{trace.str()}; +#else + // backtrace_symbols not supported on android + return ""; +#endif } } // namespace wpi