Revert "Revert "Portability fixes""

This reverts commit 59e2a844f04a8725e8079f854158aa86ef5988b2, and
defines _DARWIN_C_SOURCE in toxcore/network.c

4 files changed, 9 insertions, 2 deletions

diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index 0e2d0085..d9ace28a 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, id + NUM_RESERVED_PORTS};
+    uint8_t data[2] = {TCP_PACKET_CONNECTION_NOTIFICATION, (uint8_t)(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, id + NUM_RESERVED_PORTS};
+    uint8_t data[2] = {TCP_PACKET_DISCONNECT_NOTIFICATION, (uint8_t)(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 31e8fd8b..f58cde77 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -21,6 +21,9 @@
  *
  */
 
+#define _DARWIN_C_SOURCE
+#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 37298ce2..3276d2d5 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -21,6 +21,8 @@
  *
  */
 
+#define _XOPEN_SOURCE 600
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/toxcore/util.c b/toxcore/util.c
index 7a390ea9..1d2a85dc 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -22,6 +22,8 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE 600
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif