summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-04-01 04:20:07 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-08-15 09:46:12 +0000
commitcdfb017eb04a6a635ff4d42a5269119121f28ed6 (patch)
tree48cb14fae16c6c1e1225dc09907c76e04415d928
parent0a1574bb1347f856524014ef23cb2d686361075c (diff)
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>
-rw-r--r--ui/sdl.c4
1 files changed, 4 insertions, 0 deletions
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 <SDL.h>
#include <SDL_syswm.h>