Use <stdlib.h> for alloca on FreeBSD.

https://www.freebsd.org/cgi/man.cgi?alloca

If stdlib.h does not define alloca, and we're using GCC (or Clang), we
define the macro ourselves in terms of a GCC builtin.

5 files changed, 24 insertions, 2 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 33ebc690..747f7328 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -535,7 +535,7 @@ int pack_nodes(uint8_t *data, uint16_t length, const Node_format *nodes, uint16_
         memcpy(data + packed_length, nodes[i].public_key, CRYPTO_PUBLIC_KEY_SIZE);
         packed_length += CRYPTO_PUBLIC_KEY_SIZE;
 
-        uint32_t increment = ipp_size + CRYPTO_PUBLIC_KEY_SIZE;
+        const uint32_t increment = ipp_size + CRYPTO_PUBLIC_KEY_SIZE;
         assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
     }
 
@@ -571,7 +571,7 @@ int unpack_nodes(Node_format *nodes, uint16_t max_num_nodes, uint16_t *processed
         len_processed += CRYPTO_PUBLIC_KEY_SIZE;
         ++num;
 
-        uint32_t increment = ipp_size + CRYPTO_PUBLIC_KEY_SIZE;
+        const uint32_t increment = ipp_size + CRYPTO_PUBLIC_KEY_SIZE;
         assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
     }
 
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 3cb0fbb6..bc7d055b 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2258,10 +2258,14 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
 
             uint8_t filenumber = data[0];
 
+#if UINT8_MAX >= MAX_CONCURRENT_FILE_PIPES
+
             if (filenumber >= MAX_CONCURRENT_FILE_PIPES) {
                 break;
             }
 
+#endif
+
             uint64_t filesize;
             uint32_t file_type;
             uint16_t filename_length = data_length - head_length;
@@ -2318,10 +2322,14 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
             uint8_t filenumber = data[1];
             uint8_t control_type = data[2];
 
+#if UINT8_MAX >= MAX_CONCURRENT_FILE_PIPES
+
             if (filenumber >= MAX_CONCURRENT_FILE_PIPES) {
                 break;
             }
 
+#endif
+
             if (handle_filecontrol(m, i, send_receive, filenumber, control_type, data + 3, data_length - 3, userdata) == -1) {
                 // TODO(iphydf): Do something different here? Right now, this
                 // check is pointless.
@@ -2338,10 +2346,14 @@ static int m_handle_packet(void *object, int i, const uint8_t *temp, uint16_t le
 
             uint8_t filenumber = data[0];
 
+#if UINT8_MAX >= MAX_CONCURRENT_FILE_PIPES
+
             if (filenumber >= MAX_CONCURRENT_FILE_PIPES) {
                 break;
             }
 
+#endif
+
             struct File_Transfers *ft = &m->friendlist[i].file_receiving[filenumber];
 
             if (ft->status != FILESTATUS_TRANSFERRING) {
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index a261a507..26977036 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -37,6 +37,10 @@
 /* This cannot be bigger than 256 */
 #define MAX_CONCURRENT_FILE_PIPES 256
 
+#if MAX_CONCURRENT_FILE_PIPES > UINT8_MAX + 1
+#error "uint8_t cannot represent all file transfer numbers"
+#endif
+
 
 #define FRIEND_ADDRESS_SIZE (CRYPTO_PUBLIC_KEY_SIZE + sizeof(uint32_t) + sizeof(uint16_t))
 
diff --git a/toxcore/ccompat.h b/toxcore/ccompat.h
index e72e66ae..05212ec5 100644
--- a/toxcore/ccompat.h
+++ b/toxcore/ccompat.h
@@ -29,6 +29,11 @@
 // Emulation using alloca.
 #ifdef _WIN32
 #include <malloc.h>
+#elif defined(__FreeBSD__)
+#include <stdlib.h>
+#if !defined(alloca) && defined(__GNUC__)
+#define alloca __builtin_alloca
+#endif
 #else
 #include <alloca.h>
 #endif
diff --git a/toxcore/network.c b/toxcore/network.c
index 7d6e415a..56f9aea0 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -31,6 +31,7 @@
 #endif
 
 #if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_WINXP
+#undef _WIN32_WINNT
 #define _WIN32_WINNT  0x501
 #endif