From cdfb017eb04a6a635ff4d42a5269119121f28ed6 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 1 Apr 2010 04:20:07 +0000 Subject: 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 Signed-off-by: Blue Swirl --- ui/sdl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/sdl.c b/ui/sdl.c index 0072680f4..f599d4242 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 #include -- cgit v1.2.3