summaryrefslogtreecommitdiffstats
path: root/qemu-os-win32.h
diff options
context:
space:
mode:
authorMichael S. Tsirkin2011-06-14 16:51:11 +0200
committerMichael S. Tsirkin2011-06-15 17:27:15 +0200
commitbefeac45d4d9afb587eca9a27d975db4a7950960 (patch)
treeaab24c856a3ea944e287d7f2591bb4bab6a56eb4 /qemu-os-win32.h
parentprint meaningful error message in case of --disable-vhost-net (diff)
parentconfigure: Detect and don't try to use older libcurl (diff)
downloadqemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz
qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz
qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip
Merge remote-tracking branch 'origin/master' into pci
Conflicts: hw/virtio-pci.c
Diffstat (limited to 'qemu-os-win32.h')
-rw-r--r--qemu-os-win32.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index ed2753d1b7..8a069d7fb6 100644
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -29,6 +29,9 @@
#include <windows.h>
#include <winsock2.h>
+/* Declaration of ffs() is missing in MinGW's strings.h. */
+int ffs(int i);
+
/* Polling handling */
/* return TRUE if no sleep should be done afterwards */