X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Funix.cpp;h=9d8cf2780af0da1d99eb177136944b30659730bb;hp=373b65af6d3d5f0b340ca5590f9685c21ab3e238;hb=136c9eec2b72bfad4788908de5552fbd62216148;hpb=b5f2e718a2fd3d2e7422476e70ca7b1de5e32175

diff --git a/source/net/unix.cpp b/source/net/unix.cpp
index 373b65a..9d8cf27 100644
--- a/source/net/unix.cpp
+++ b/source/net/unix.cpp
@@ -1,5 +1,5 @@
 #include <stdexcept>
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/un.h>
 #endif
 #include "sockaddr_private.h"
@@ -13,7 +13,7 @@ namespace Net {
 UnixAddr::UnixAddr():
 	abstract(false)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	throw logic_error("no unix sockets on windows");
 #endif
 }
@@ -21,12 +21,12 @@ UnixAddr::UnixAddr():
 UnixAddr::UnixAddr(const SysAddr &sa):
 	abstract(false)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)sa;
 	throw logic_error("no unix sockets on windows");
 #else
 	const sockaddr_un &sau = reinterpret_cast<const sockaddr_un &>(sa.addr);
-	if(sa.size>sizeof(sa_family_t))
+	if(static_cast<size_t>(sa.size)>sizeof(sa_family_t))
 	{
 		abstract = (sau.sun_path[0]==0);
 		path.assign(sau.sun_path+abstract, sa.size-sizeof(sa_family_t)-abstract);
@@ -38,7 +38,7 @@ UnixAddr::UnixAddr(const string &p, bool a):
 	path(p),
 	abstract(a)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	throw logic_error("no unix sockets on windows");
 #else
 	if(sizeof(sa_family_t)+path.size()+1>sizeof(sockaddr_storage))
@@ -49,7 +49,7 @@ UnixAddr::UnixAddr(const string &p, bool a):
 SockAddr::SysAddr UnixAddr::to_sys() const
 {
 	SysAddr sa;
-#ifndef WIN32
+#ifndef _WIN32
 	sa.size = sizeof(sa_family_t);
 	if(!path.empty())
 		sa.size += path.size()+1;