Merge branch 'develop'

2016-09-02 11:25:23 +02:00
parent 1d4125cf6a f8a1631fc4
commit 9749a5577a
1 changed files with 5 additions and 0 deletions
@@ -160,7 +160,12 @@ int main(int argc, char** argv) {
    // Process options
    std::string user_id = ""; // ID of the receiving user

+#ifdef __arm__
+    int c;
+#else
    char c;
+#endif
+
    while ((c = getopt(argc, argv, "u:")) != -1) {
      switch(c) {
      case 'u':