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.h | |
| parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) | |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'lib/server/Socket.h')
| -rwxr-xr-x | lib/server/Socket.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/server/Socket.h b/lib/server/Socket.h index 86a06097..057e4cad 100755 --- a/lib/server/Socket.h +++ b/lib/server/Socket.h @@ -10,16 +10,23 @@ #ifndef SOCKET__H #define SOCKET__H +#ifdef WIN32 +#include "emu.h" +typedef int socklen_t; +#else #include <sys/socket.h> #include <netinet/in.h> #include <sys/un.h> +#endif #include <string> typedef union { struct sockaddr sa_generic; struct sockaddr_in sa_inet; +#ifndef WIN32 struct sockaddr_un sa_unix; +#endif } SocketAllAddr; // -------------------------------------------------------------------------- |