Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9

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;
 }