FIX: removed some warnings about time_t in non-windows systems. This appeared since I fiddled in proxmark.h
This commit is contained in:
@@ -12,9 +12,6 @@
|
||||
#define MAX_BIN_BREAK_LENGTH (3072+384+1)
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <termios.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
int ukbhit(void) {
|
||||
int cnt = 0;
|
||||
int error;
|
||||
@@ -38,7 +35,6 @@ int ukbhit(void) {
|
||||
}
|
||||
|
||||
#else
|
||||
#include <conio.h>
|
||||
int ukbhit(void) {
|
||||
return kbhit();
|
||||
}
|
||||
|
||||
@@ -17,6 +17,18 @@
|
||||
#include "proxmark3.h" // time_t
|
||||
#include "data.h" // for FILE_PATH_SIZE
|
||||
|
||||
// Handle platform specific includes
|
||||
#ifndef _WIN32
|
||||
#include <termios.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
#else
|
||||
#include <conio.h>
|
||||
#include <time.h>
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef BITMASK
|
||||
# define BITMASK(X) (1 << (X))
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user