MERGE: libnfc-mingw-cross merge with trunk (r805-821)
This commit is contained in:
parent
6df612a364
commit
58dcf63e7c
19 changed files with 246 additions and 110 deletions
|
|
@ -39,10 +39,7 @@
|
|||
#include "../mirror-subr.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <windows.h>
|
||||
|
||||
# define strdup _strdup
|
||||
# define snprintf sprintf_s
|
||||
# include "../../contrib/windows.h"
|
||||
#endif
|
||||
|
||||
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue