diff options
| author | Blue Swirl | 2012-04-15 21:56:06 +0200 |
|---|---|---|
| committer | Blue Swirl | 2012-04-15 21:56:06 +0200 |
| commit | e6f5d0be730a41bacb10edba19d1369ec2949486 (patch) | |
| tree | ecf6fded694c4409c16d953f36d6e68aca33de12 /qemu_socket.h | |
| parent | target-alpha: QOM'ify CPU init (diff) | |
| parent | w64: Fix time conversion for some versions of MinGW-w64 (diff) | |
| download | qemu-e6f5d0be730a41bacb10edba19d1369ec2949486.tar.gz qemu-e6f5d0be730a41bacb10edba19d1369ec2949486.tar.xz qemu-e6f5d0be730a41bacb10edba19d1369ec2949486.zip | |
Merge branch 'w64' of git://qemu.weilnetz.de/qemu
* 'w64' of git://qemu.weilnetz.de/qemu:
w64: Fix time conversion for some versions of MinGW-w64
nbd: Fix compiler warning (w64)
disas: Replace 'unsigned long' by 'uintptr_t'
cpu-exec: Remove non-portable type cast and fix format string
target-mips: Fix type cast for w64 (uintptr_t)
w64: Fix type cast in os_host_main_loop_wait
w64: Fix data types in softmmu*.h
w64: Use uintptr_t in exec.c
softmmu: Use uintptr_t for physaddr and rename it
w64: Fix struct CPUTLBEntry
w64: Fix definition of setjmp
w32: Move defines for socket specific errors to qemu-os-win32.h
w64: Use larger alignment for section with generated code
w64: Fix data types in cpu-all.h, exec.c
w64: Fix type casts used in some macros in cpu-all.h
tcg/i386: Add support for w64 ABI
tcg/i386: Use GDB JIT debugging interface only for hosts with ELF
Diffstat (limited to 'qemu_socket.h')
| -rw-r--r-- | qemu_socket.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/qemu_socket.h b/qemu_socket.h index 51ad210a7f..a5d0a84fb6 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -8,12 +8,6 @@ #include <ws2tcpip.h> #define socket_error() WSAGetLastError() -#undef EWOULDBLOCK -#undef EINTR -#undef EINPROGRESS -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EINTR WSAEINTR -#define EINPROGRESS WSAEINPROGRESS int inet_aton(const char *cp, struct in_addr *ia); |