From: Iceman <iceman@iuse.se>
Date: Mon, 6 Mar 2017 19:46:09 +0000 (+0100)
Subject: Merge pull request #226 from pwpiwi/fix_defines
X-Git-Tag: v3.0.0~58
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7ea23ef5b3278a9a1b54b8901473a93b71a2bc12?hp=571324a5c4b3edf7460633ca66ca5081aa4fdc6b

Merge pull request #226 from pwpiwi/fix_defines

Fix some #defines
---

diff --git a/client/Makefile b/client/Makefile
index 7c2a7a71..c1ff5ee3 100644
--- 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)
-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)))
-    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
diff --git a/client/hid-flasher/proxendian.h b/client/hid-flasher/proxendian.h
index 4a386a0d..4f5a4519 100644
--- a/client/hid-flasher/proxendian.h
+++ b/client/hid-flasher/proxendian.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 # define HOST_LITTLE_ENDIAN
 #else
 # include <sys/types.h>
diff --git a/client/hid-flasher/sleep.h b/client/hid-flasher/sleep.h
index 81f4e060..62d9f4d1 100644
--- a/client/hid-flasher/sleep.h
+++ b/client/hid-flasher/sleep.h
@@ -11,7 +11,7 @@
 #ifndef SLEEP_H__
 #define SLEEP_H__
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #define sleep(n) Sleep(1000 * n)
 #define msleep(n) Sleep(n)