aboutsummaryrefslogtreecommitdiffstats
path: root/osdep.c
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2010-09-10 14:15:17 +0200
committerDavid 'Digit' Turner <digit@android.com>2010-09-13 00:30:35 -0700
commit315ceb8a16eb7a2102fee4946898e7b8a202e86a (patch)
tree965bfdf7ad21143b823590e9f1ab7da086fb0ddd /osdep.c
parent9d1188280fa5294f9438424e5e8eae91f645bfd8 (diff)
downloadexternal_qemu-315ceb8a16eb7a2102fee4946898e7b8a202e86a.zip
external_qemu-315ceb8a16eb7a2102fee4946898e7b8a202e86a.tar.gz
external_qemu-315ceb8a16eb7a2102fee4946898e7b8a202e86a.tar.bz2
upstream: qemu-sockets changes.
Diffstat (limited to 'osdep.c')
-rw-r--r--osdep.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/osdep.c b/osdep.c
index 041ed50..149d905 100644
--- a/osdep.c
+++ b/osdep.c
@@ -43,14 +43,21 @@
#ifdef _WIN32
#include <windows.h>
-#include <winsock2.h>
-typedef int32_t socklen_t;
#elif defined(CONFIG_BSD)
#include <stdlib.h>
#else
#include <malloc.h>
#endif
+#ifdef CONFIG_ANDROID
+#ifdef WIN32
+#include <winsock2.h>
+typedef int32_t socklen_t;
+#else
+#include <sys/socket.h>
+#endif
+#endif /* CONFIG_ANDROID */
+
#include "qemu-common.h"
#include "sysemu.h"
#include "qemu_socket.h"