summaryrefslogtreecommitdiff
path: root/toxcore/Messenger.h
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-02-23 02:22:38 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-02-24 22:20:22 +0000
commitd3b286cb434ed228e7b62cc70cb293e7a5554bfa (patch)
tree9ab3dd66f9dba2ca861ba8c6e098fb96754aa80b /toxcore/Messenger.h
parentafc80922e720f5d2a93bdfb3745da058e5ddf81b (diff)
Fix a bunch of compiler warnings and remove suppressions.
Diffstat (limited to 'toxcore/Messenger.h')
-rw-r--r--toxcore/Messenger.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 956f8ac5..402eb916 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -37,7 +37,7 @@
37/* This cannot be bigger than 256 */ 37/* This cannot be bigger than 256 */
38#define MAX_CONCURRENT_FILE_PIPES 256 38#define MAX_CONCURRENT_FILE_PIPES 256
39 39
40#if MAX_CONCURRENT_FILE_PIPES > UINT8_MAX + 1 40#if !defined(__SPLINT__) && MAX_CONCURRENT_FILE_PIPES > UINT8_MAX + 1
41#error "uint8_t cannot represent all file transfer numbers" 41#error "uint8_t cannot represent all file transfer numbers"
42#endif 42#endif
43 43
@@ -74,13 +74,13 @@ enum {
74#define PACKET_LOSSY_AV_RESERVED 8 /* Number of lossy packet types at start of range reserved for A/V. */ 74#define PACKET_LOSSY_AV_RESERVED 8 /* Number of lossy packet types at start of range reserved for A/V. */
75 75
76typedef struct { 76typedef struct {
77 uint8_t ipv6enabled; 77 bool ipv6enabled;
78 uint8_t udp_disabled; 78 bool udp_disabled;
79 TCP_Proxy_Info proxy_info; 79 TCP_Proxy_Info proxy_info;
80 uint16_t port_range[2]; 80 uint16_t port_range[2];
81 uint16_t tcp_server_port; 81 uint16_t tcp_server_port;
82 82
83 uint8_t hole_punching_enabled; 83 bool hole_punching_enabled;
84 bool local_discovery_enabled; 84 bool local_discovery_enabled;
85 85
86 logger_cb *log_callback; 86 logger_cb *log_callback;