diff options
| author | Davide Beatrici <git@davidebeatrici.dev> | 2021-03-28 00:47:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-28 00:47:44 +0300 |
| commit | 604427ccdd2c36804d55dad72367abb27f0d2433 (patch) | |
| tree | 552d4c3ce85e07ad7592caed96b161bc7c1bd60c /src | |
| parent | ae2a8ee95b8fc7104a3e9c228bfd8b934eb41de0 (diff) | |
| parent | f70ebcccabbe0d83695b92245c899627a5e67d58 (diff) | |
Merge PR #4885: REFAC(server): Replace non-standard u_char with uint8_t
Diffstat (limited to 'src')
| -rw-r--r-- | src/murmur/Server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index e8cc11ba6..2e71fd798 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -705,7 +705,7 @@ void Server::udpActivated(int socket) { iov[0].iov_base = encrypt; iov[0].iov_len = UDP_PACKET_SIZE; - u_char controldata[CMSG_SPACE(MAX(sizeof(struct in6_pktinfo), sizeof(struct in_pktinfo)))]; + uint8_t controldata[CMSG_SPACE(MAX(sizeof(struct in6_pktinfo), sizeof(struct in_pktinfo)))]; memset(&msg, 0, sizeof(msg)); msg.msg_name = reinterpret_cast< struct sockaddr * >(&from); @@ -843,7 +843,7 @@ void Server::run() { iov[0].iov_base = encrypt; iov[0].iov_len = UDP_PACKET_SIZE; - u_char controldata[CMSG_SPACE(MAX(sizeof(struct in6_pktinfo), sizeof(struct in_pktinfo)))]; + uint8_t controldata[CMSG_SPACE(MAX(sizeof(struct in6_pktinfo), sizeof(struct in_pktinfo)))]; memset(&msg, 0, sizeof(msg)); msg.msg_name = reinterpret_cast< struct sockaddr * >(&from); @@ -1022,7 +1022,7 @@ void Server::sendMessage(ServerUser *u, const char *data, int len, QByteArray &c iov[0].iov_base = buffer; iov[0].iov_len = len + 4; - u_char controldata[CMSG_SPACE(MAX(sizeof(struct in6_pktinfo), sizeof(struct in_pktinfo)))]; + uint8_t controldata[CMSG_SPACE(MAX(sizeof(struct in6_pktinfo), sizeof(struct in_pktinfo)))]; memset(controldata, 0, sizeof(controldata)); memset(&msg, 0, sizeof(msg)); |