projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added 424KHz mode for iso 15693 simulation
[proxmark3-svn]
/
client
/
util.h
diff --git
a/client/util.h
b/client/util.h
index 1d410592e1d39dfc1032cbfd5d551cafd8845b6f..ce8876ed9323518b988d94b2fd347b8b3861e3cd 100644
(file)
--- a/
client/util.h
+++ b/
client/util.h
@@
-16,8
+16,12
@@
#include <ctype.h>
#include <time.h>
#include <ctype.h>
#include <time.h>
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#ifndef MIN
+# define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+# define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
int ukbhit(void);
int ukbhit(void);
Impressum
,
Datenschutz