diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-05-15 09:51:59 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-15 12:34:39 +0200 |
| commit | 077030d11e27811749020af744e67e4267ee90e1 (patch) | |
| tree | 60d978ad5fcb7e32872ecfd51fbfdd9d26570521 | |
| parent | 1de9756b97daec3c15f8048631af866e9cb58562 (diff) | |
| download | qemu-077030d11e27811749020af744e67e4267ee90e1.tar.gz qemu-077030d11e27811749020af744e67e4267ee90e1.tar.bz2 qemu-077030d11e27811749020af744e67e4267ee90e1.zip | |
w32: Fix missing declaration of ffs()
target-ppc/cpu.h now needs ffs(), too, so ffs() must be declared
before this file is included.
Moving the declaration from qemu-common.h to qemu-os-win32.h
(which is included in qemu-common.h early) fixes the compiler
warning for w32.
Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | qemu-common.h | 5 | ||||
| -rw-r--r-- | qemu-os-win32.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/qemu-common.h b/qemu-common.h index f9f705da85..bba8dfec5e 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -201,11 +201,6 @@ const char *path(const char *pathname); #define qemu_isascii(c) isascii((unsigned char)(c)) #define qemu_toascii(c) toascii((unsigned char)(c)) -#ifdef _WIN32 -/* ffs() in oslib-win32.c for WIN32, strings.h for the rest of the world */ -int ffs(int i); -#endif - void *qemu_oom_check(void *ptr); void *qemu_malloc(size_t size); void *qemu_realloc(void *ptr, size_t size); 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 */ |