diff options
author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
---|---|---|
committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
commit | 3bedf8846f4d7a5cb38276b274662d62a36dcd52 (patch) | |
tree | 9d51de8b0f3d06ba6549a5a1958e52f592343140 /lib/server/Socket.cpp | |
parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'lib/server/Socket.cpp')
-rwxr-xr-x | lib/server/Socket.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/server/Socket.cpp b/lib/server/Socket.cpp index b2d32345..0343b8bf 100755 --- a/lib/server/Socket.cpp +++ b/lib/server/Socket.cpp @@ -11,11 +11,13 @@ #include <unistd.h> #include <sys/types.h> +#ifndef WIN32 #include <sys/socket.h> #include <netdb.h> #include <syslog.h> #include <netinet/in.h> #include <arpa/inet.h> +#endif #include <string.h> #include <stdio.h> @@ -72,6 +74,7 @@ void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, int Type } break; +#ifndef WIN32 case TypeUNIX: sockDomain = AF_UNIX; { @@ -89,7 +92,8 @@ void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, int Type ::strcpy(addr.sa_unix.sun_path, Name); } break; - +#endif + default: THROW_EXCEPTION(CommonException, BadArguments) break; |