From 1247976a342b9aa38e90e10a9e38b92eef599ab7 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 3 Jan 2016 21:26:51 -0800 Subject: [PATCH] Fixes Android Build issues Trying to build with the android standalone compiler, and these 2 things were causing errors. I don't know what an equivalent to basename would be, because I don't really know what it does. --- src/Log.cpp | 4 ++++ src/networktables/NetworkTable.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Log.cpp b/src/Log.cpp index 9b5a18ddc6..6f71348b93 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -18,6 +18,10 @@ #include #endif +#ifdef __ANDROID__ + #include +#endif + using namespace nt; ATOMIC_STATIC_INIT(Logger) diff --git a/src/networktables/NetworkTable.cpp b/src/networktables/NetworkTable.cpp index 7eb377225f..119e733b21 100644 --- a/src/networktables/NetworkTable.cpp +++ b/src/networktables/NetworkTable.cpp @@ -44,7 +44,8 @@ void NetworkTable::SetTeam(int team) { #ifdef _MSC_VER sprintf_s(tmp, "roboRIO-%d-FRC.local\n", team); #else - std::snprintf(tmp, 30, "roboRIO-%d-FRC.local\n",team); + using namespace std; + snprintf(tmp, 30, "roboRIO-%d-FRC.local\n",team); #endif SetIPAddress(tmp); }