[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] w32: Fix missing declaration of ffs()
From: |
Stefan Weil |
Subject: |
[Qemu-devel] [PATCH] w32: Fix missing declaration of ffs() |
Date: |
Sun, 15 May 2011 09:51:59 +0200 |
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 <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
---
qemu-common.h | 5 -----
qemu-os-win32.h | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/qemu-common.h b/qemu-common.h
index f9f705d..bba8dfe 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 ed2753d..8a069d7 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 */
--
1.5.6.5
- [Qemu-devel] [PATCH] w32: Fix missing declaration of ffs(),
Stefan Weil <=