summaryrefslogtreecommitdiff
path: root/src/sockets.cpp
diff options
context:
space:
mode:
authorNaram Qashat <cyberbotx@cyberbotx.com>2011-10-24 16:32:29 -0400
committerNaram Qashat <cyberbotx@cyberbotx.com>2011-10-24 16:32:29 -0400
commit377a7a968b6a906f262a45abea9a563ffc471938 (patch)
tree3743f5d564bd7b40db5659bf6e18dd102b5c5c19 /src/sockets.cpp
parentd0513d6506ce34b57874ad265daf38ca67878aa0 (diff)
Fixed bug #1349 (m_sqlite compiles without error under FreeBSD), as well as use C99's stdint.h (or cstdint if available) to get (u)intX_t types instead of our stupid typedefs. pstdint.h included in case there is no cstdint or stdint.h available.
Diffstat (limited to 'src/sockets.cpp')
-rw-r--r--src/sockets.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sockets.cpp b/src/sockets.cpp
index 91d3eaac0..fa79d32f2 100644
--- a/src/sockets.cpp
+++ b/src/sockets.cpp
@@ -2,8 +2,8 @@
std::map<int, Socket *> SocketEngine::Sockets;
-int32 TotalRead = 0;
-int32 TotalWritten = 0;
+int32_t TotalRead = 0;
+int32_t TotalWritten = 0;
SocketIO normalSocketIO;
@@ -232,7 +232,7 @@ bool cidr::match(sockaddrs &other)
default:
throw SocketException("Invalid address type");
}
-
+
if (memcmp(ip, their_ip, byte))
return false;
@@ -241,7 +241,7 @@ bool cidr::match(sockaddrs &other)
byte = this->cidr_len % 8;
if ((*ip & byte) != (*their_ip & byte))
return false;
-
+
return true;
}