Merge remote-tracking branch 'upstream/master'

diff --git a/client/Makefile b/client/Makefile
index 8dd8ddef513ce3657e57bd228ef9e238139cc594..5aa86148ff9353ea6e1dcf721b3566a2615e5239 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,6 +19,7 @@ CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
+    CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw