Fix some #defines

- Use -D_ISOC99_SOURCE instead of -D__USE_MINGW_ANSI_STDIO=1
- WIN32 is deprecated. Use _WIN32 instead

diff --git a/client/Makefile b/client/Makefile
index 7c2a7a71d412d87311eac1b524042cca9b526926..c1ff5ee37125899f55fd61ce0e87469d256b4ff4 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -15,11 +15,10 @@ OBJDIR = obj
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)

-CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4

 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
 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
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw

diff --git a/client/hid-flasher/proxendian.h b/client/hid-flasher/proxendian.h
index 4a386a0ddd244cd47d200b360348928a8cbc85ad..4f5a45194aa65126e2cc8409f7b0dd24a906676f 100644 (file)
--- a/client/hid-flasher/proxendian.h
+++ b/client/hid-flasher/proxendian.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
 
 #include <stdint.h>
 

-#ifdef WIN32
+#ifdef _WIN32

 # define HOST_LITTLE_ENDIAN
 #else
 # include <sys/types.h>
 # define HOST_LITTLE_ENDIAN
 #else
 # include <sys/types.h>

diff --git a/client/hid-flasher/sleep.h b/client/hid-flasher/sleep.h
index 81f4e06031943aee3c8de7b131388492d8462f80..62d9f4d16974e27ecbc85926589c2fb8b173046a 100644 (file)
--- a/client/hid-flasher/sleep.h
+++ b/client/hid-flasher/sleep.h
@@ -11,7 +11,7 @@
 #ifndef SLEEP_H__
 #define SLEEP_H__
 
 #ifndef SLEEP_H__
 #define SLEEP_H__
 

-#ifdef WIN32
+#ifdef _WIN32

 #include <windows.h>
 #define sleep(n) Sleep(1000 * n)
 #define msleep(n) Sleep(n)
 #include <windows.h>
 #define sleep(n) Sleep(1000 * n)
 #define msleep(n) Sleep(n)