27 files changed, 24 insertions, 92 deletions

diff --git a/.gitignore b/.gitignore
index 14dcced7..2a82d308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,9 +21,6 @@ install_manifest.txt
 tags
 Makefile.in
 CMakeLists.txt.user
-DartConfiguration.tcl
-CTestTestfile.cmake
-*.pc
 
 # Testing
 testing/data
@@ -43,9 +40,6 @@ testing/data
 *.app
 *.la
 
-# Libraries
-*.so
-
 # Misc (?)
 m4/*
 configure
@@ -57,6 +51,8 @@ config.log
 config.status
 stamp-h1
 autom4te.cache
+libtoxcore.pc
+libtoxav.pc
 libtool
 .deps
 .libs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0707a76..e0f5d123 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,21 +56,22 @@ macro(add_flag flag)
   add_cflag(${flag})
   add_cxxflag(${flag})
 endmacro()
-  
-# Set standard version for compiler.
-add_cflag("-std=c99")
-add_cxxflag("-std=c++11")
-
-# Error on non-ISO C.
-add_cflag("-pedantic-errors")
 
 option(WARNINGS "Enable additional compiler warnings" ON)
 if(WARNINGS)
+  # Set standard version for compiler.
+  add_cflag("-std=gnu99")
+  add_cxxflag("-std=c++98")
+
   # Add all warning flags we can.
   add_flag("-Wall")
   add_flag("-Wextra")
   add_flag("-Weverything")
 
+  # -pedantic only for C, because in C++ we want to allow the GNU/C99 extension
+  # of having a comma at the end of an enumerator list.
+  add_cflag("-pedantic")
+
   # Disable specific warning flags for both C and C++.
   add_flag("-Wno-cast-align")
   add_flag("-Wno-conversion")
diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 6a439261..d9013378 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index 36707e0f..aa2f8e13 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -1,8 +1,6 @@
 /* Auto Tests: Conferences.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -177,7 +175,7 @@ group_test_restart:
          * Either way in this case it's fine  */
         if (peer_count != NUM_GROUP_TOX) {
             ++test_run;
-            printf("\tError starting up the first group (peer_count %" PRIu32 " != %d, test_run = %d)\n", peer_count, NUM_GROUP_TOX,
+            printf("\tError starting up the first group (peer_count %"PRIu32" != %d, test_run = %d)\n", peer_count, NUM_GROUP_TOX,
                    test_run);
 
             for (j = 0; j < NUM_GROUP_TOX; ++j) {
@@ -196,7 +194,7 @@ group_test_restart:
          * important again.
          */
         ck_assert_msg(peer_count == NUM_GROUP_TOX, "\n\tBad number of group peers (pre check)."
-                      "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %" PRIu32 "\n\n",
+                      "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %"PRIu32"\n\n",
                       NUM_GROUP_TOX, i, peer_count);
 
         uint8_t title[2048];
@@ -243,7 +241,7 @@ group_test_restart:
         for (i = 0; i < (k - 1); ++i) {
             uint32_t peer_count = tox_conference_peer_count(toxes[i], 0, NULL);
             ck_assert_msg(peer_count == (k - 1), "\n\tBad number of group peers (post check)."
-                          "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %" PRIu32 "\n\n",
+                          "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %"PRIu32"\n\n",
                           (k - 1), i, peer_count);
         }
     }
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 633e7002..9cec1643 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
index ca918778..783f3f7b 100644
--- a/auto_tests/network_test.c
+++ b/auto_tests/network_test.c
@@ -114,8 +114,8 @@ START_TEST(test_ip_equal)
     ip2.ip6.uint32[2] = htonl(0xFFFF);
     ip2.ip6.uint32[3] = htonl(0x7F000001);
 
-    ck_assert_msg(IPV6_IPV4_IN_V6(ip2.ip6) != 0,
-                  "IPV6_IPV4_IN_V6(::ffff:127.0.0.1): expected != 0, got 0.");
+    ck_assert_msg(IN6_IS_ADDR_V4MAPPED(&ip2.ip6.in6_addr) != 0,
+                  "IN6_IS_ADDR_V4MAPPED(::ffff:127.0.0.1): expected != 0, got 0.");
 
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res != 0, "ip_equal( {AF_INET, 127.0.0.1}, {AF_INET6, ::ffff:127.0.0.1} ): expected result != 0, got 0.");
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index 05264927..44ea9c7d 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/save_friend_test.c b/auto_tests/save_friend_test.c
index 448160c0..9d36ff2d 100644
--- a/auto_tests/save_friend_test.c
+++ b/auto_tests/save_friend_test.c
@@ -1,10 +1,7 @@
 /* Auto Tests: Save and load friends.
  */
 
-#define _XOPEN_SOURCE 600
-
 #include "helpers.h"
-#include "../toxcore/tox.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/auto_tests/tox_many_tcp_test.c b/auto_tests/tox_many_tcp_test.c
index 48f5671c..197c6e47 100644
--- a/auto_tests/tox_many_tcp_test.c
+++ b/auto_tests/tox_many_tcp_test.c
@@ -1,8 +1,6 @@
 /* Auto Tests: Many TCP.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/tox_many_test.c b/auto_tests/tox_many_test.c
index b44bbb0c..0c4c8c7d 100644
--- a/auto_tests/tox_many_test.c
+++ b/auto_tests/tox_many_test.c
@@ -1,8 +1,6 @@
 /* Auto Tests: Many clients.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index ab2202d1..dfd1d80a 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -10,8 +10,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index 79f552de..767fca87 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 1a10db44..b33b93c8 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index fa71d920..e056de41 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -22,8 +22,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/other/bootstrap_daemon/src/log.c b/other/bootstrap_daemon/src/log.c
index ae418f93..7632d739 100644
--- a/other/bootstrap_daemon/src/log.c
+++ b/other/bootstrap_daemon/src/log.c
@@ -26,8 +26,8 @@
 
 #include "global.h"
 
-#include <assert.h>
 #include <syslog.h>
+
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -82,22 +82,7 @@ static int level_syslog(LOG_LEVEL level)
 
 static void log_syslog(LOG_LEVEL level, const char *format, va_list args)
 {
-    va_list args2;
-
-    va_copy(args2, args);
-    int size = vsnprintf(NULL, 0, format, args2);
-    va_end(args2);
-
-    assert(size >= 0);
-
-    if (size < 0) {
-        return;
-    }
-
-    char buf[size + 1];
-    vsnprintf(buf, size + 1, format, args);
-
-    syslog(level_syslog(level), "%s", buf);
+    vsyslog(level_syslog(level), format, args);
 }
 
 static FILE *level_stdout(LOG_LEVEL level)
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index a0504eee..4495f88e 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -22,8 +22,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 // system provided
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 6d20d550..c994f543 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -27,8 +27,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 695c50ae..4fd81649 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -37,8 +37,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testing/av_test.c b/testing/av_test.c
index aeb661be..7418a15a 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -22,8 +22,6 @@
  *   -lopencv_highgui -lopencv_imgproc -lsndfile -pthread -lvpx -lopus -lsodium -lportaudio
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index b63b6151..affc0296 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 600
 
 #include <stdint.h>
 #include <stdio.h>
@@ -35,8 +34,8 @@ static uint16_t port = 6667;
 
 static int sock;
 
-#define SERVER_CONNECT "NICK " IRC_NAME "\nUSER " IRC_NAME " 8 * :" IRC_NAME "\n"
-#define CHANNEL_JOIN "JOIN " IRC_CHANNEL "\n"
+#define SERVER_CONNECT "NICK "IRC_NAME"\nUSER "IRC_NAME" 8 * :"IRC_NAME"\n"
+#define CHANNEL_JOIN "JOIN "IRC_CHANNEL"\n"
 
 /* In toxcore/network.c */
 uint64_t current_time_monotonic(void);
@@ -132,8 +131,8 @@ static void copy_groupmessage(Tox *tox, uint32_t groupnumber, uint32_t friendgro
     uint8_t sendbuf[2048];
     uint16_t send_len = 0;
 
-    memcpy(sendbuf, "PRIVMSG " IRC_CHANNEL " :", sizeof("PRIVMSG " IRC_CHANNEL " :"));
-    send_len += sizeof("PRIVMSG " IRC_CHANNEL " :") - 1;
+    memcpy(sendbuf, "PRIVMSG "IRC_CHANNEL" :", sizeof("PRIVMSG "IRC_CHANNEL" :"));
+    send_len += sizeof("PRIVMSG "IRC_CHANNEL" :") - 1;
     memcpy(sendbuf + send_len, name, namelen);
     send_len += namelen;
     sendbuf[send_len] = ':';
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 30c813ca..c1292ed8 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #ifdef TOX_DEBUG
 #include <assert.h>
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index d5de3e67..18aad9c7 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -26,8 +26,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index 6ac3dcf0..0c91abfd 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -28,8 +28,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -44,7 +42,6 @@
 #include <dirent.h>
 #include <netinet/in.h>
 #include <stdio.h>
-#include <sys/stat.h>
 
 #define NUM_FILE_SENDERS 256
 typedef struct {
@@ -300,7 +297,6 @@ int main(int argc, char *argv[])
     memcpy(path, argv[argvoffset + 4], strlen(argv[argvoffset + 4]));
     DIR           *d;
     struct dirent *dir;
-    struct stat statbuf;
     uint8_t notconnected = 1;
 
     while (1) {
@@ -314,12 +310,7 @@ int main(int argc, char *argv[])
 
             if (d) {
                 while ((dir = readdir(d)) != NULL) {
-                    char filepath[strlen(path) + strlen(dir->d_name) + 1];
-                    memcpy(filepath, path, strlen(path));
-                    memcpy(filepath + strlen(path), dir->d_name, strlen(dir->d_name) + 1);
-                    stat(filepath, &statbuf);
-
-                    if (S_ISREG(statbuf.st_mode)) {
+                    if (dir->d_type == DT_REG) {
                         char fullpath[1024];
 
                         if (path[strlen(path) - 1] == '/') {
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index d9ace28a..0e2d0085 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -619,7 +619,7 @@ static int send_routing_response(TCP_Secure_Connection *con, uint8_t rpid, const
  */
 static int send_connect_notification(TCP_Secure_Connection *con, uint8_t id)
 {
-    uint8_t data[2] = {TCP_PACKET_CONNECTION_NOTIFICATION, (uint8_t)(id + NUM_RESERVED_PORTS)};
+    uint8_t data[2] = {TCP_PACKET_CONNECTION_NOTIFICATION, id + NUM_RESERVED_PORTS};
     return write_packet_TCP_secure_connection(con, data, sizeof(data), 1);
 }
 
@@ -629,7 +629,7 @@ static int send_connect_notification(TCP_Secure_Connection *con, uint8_t id)
  */
 static int send_disconnect_notification(TCP_Secure_Connection *con, uint8_t id)
 {
-    uint8_t data[2] = {TCP_PACKET_DISCONNECT_NOTIFICATION, (uint8_t)(id + NUM_RESERVED_PORTS)};
+    uint8_t data[2] = {TCP_PACKET_DISCONNECT_NOTIFICATION, id + NUM_RESERVED_PORTS};
     return write_packet_TCP_secure_connection(con, data, sizeof(data), 1);
 }
 
diff --git a/toxcore/network.c b/toxcore/network.c
index 250a304b..31e8fd8b 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -21,8 +21,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_WINXP
 #define _WIN32_WINNT  0x501
 #endif
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 3276d2d5..37298ce2 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -21,8 +21,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/toxcore/util.c b/toxcore/util.c
index 1d2a85dc..7a390ea9 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -22,8 +22,6 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif