From: Stefan Weil <weil@mail.berlios.de>
Date: Thu, 1 Apr 2010 04:20:07 +0000 (+0000)
Subject: win32: Avoid compiler warning (WIN32_LEAN_AND_MEAN redefined)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cdfb017eb04a6a635ff4d42a5269119121f28ed6;p=qemu.git

win32: Avoid compiler warning (WIN32_LEAN_AND_MEAN redefined)

configure adds the macro WIN32_LEAN_AND_MEAN to
QEMU_CFLAGS, and SDL_syswm.h defines it, too.

This results in a compiler warning (redefinition of
WIN32_LEAN_AND_MEAN in SDL_syswm.h. That warning prevents
compilations for win32 with warning = error).

Fix this by removing the definition of WIN32_LEAN_AND_MEAN
before including SDL_syswm.h.

[blauwirbel@gmail.com: rebased]
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/ui/sdl.c b/ui/sdl.c
index 0072680f4c..f599d42425 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -21,6 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
+#undef WIN32_LEAN_AND_MEAN
+
 #include <SDL.h>
 #include <SDL_syswm.h>