diff options
| author | bellard | 2006-05-01 00:53:25 +0200 |
|---|---|---|
| committer | bellard | 2006-05-01 00:53:25 +0200 |
| commit | 6ca957f08f272321e32ccef2f4053e93dc10f4ad (patch) | |
| tree | 8c061b32dda461926dab9d5ac366668461755228 /vl.c | |
| parent | info and dvi doc targets (diff) | |
| download | qemu-6ca957f08f272321e32ccef2f4053e93dc10f4ad.tar.gz qemu-6ca957f08f272321e32ccef2f4053e93dc10f4ad.tar.xz qemu-6ca957f08f272321e32ccef2f4053e93dc10f4ad.zip | |
win32 socket fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1876 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -66,12 +66,12 @@ #include <malloc.h> #include <sys/timeb.h> #include <windows.h> -#include <winsock2.h> -#include <ws2tcpip.h> #define getopt_long_only getopt_long #define memalign(align, size) malloc(size) #endif +#include "qemu_socket.h" + #ifdef CONFIG_SDL #ifdef __APPLE__ #include <SDL/SDL.h> @@ -1085,12 +1085,6 @@ CharDriverState *qemu_chr_open_null(void) #ifdef _WIN32 -#define socket_error() WSAGetLastError() -#undef EINTR -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EINTR WSAEINTR -#define EINPROGRESS WSAEINPROGRESS - static void socket_cleanup(void) { WSACleanup(); @@ -1142,9 +1136,6 @@ void socket_set_nonblock(int fd) #else -#define socket_error() errno -#define closesocket(s) close(s) - static int unix_write(int fd, const uint8_t *buf, int len1) { int ret, len; |