dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: removed some warnings about time_t in non-windows systems. This appeared since I fiddled in proxmark.h

Browse Source
This commit is contained in:
iceman1001
2016-11-16 18:36:21 +01:00
parent 3105b814c9
commit 1ca5dce0f4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/util.c
View File

@@ -12,9 +12,6 @@
#define MAX_BIN_BREAK_LENGTH (3072+384+1) #define MAX_BIN_BREAK_LENGTH (3072+384+1)
#ifndef _WIN32 #ifndef _WIN32
#include <termios.h>
#include <sys/ioctl.h>
int ukbhit(void) { int ukbhit(void) {
int cnt = 0; int cnt = 0;
int error; int error;
@@ -38,7 +35,6 @@ int ukbhit(void) {
} }
#else #else
#include <conio.h>
int ukbhit(void) { int ukbhit(void) {
return kbhit(); return kbhit();
} }

12
client/util.h
View File

@@ -17,6 +17,18 @@
#include "proxmark3.h" // time_t #include "proxmark3.h" // time_t
#include "data.h" // for FILE_PATH_SIZE #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 #ifndef BITMASK
# define BITMASK(X) (1 << (X)) # define BITMASK(X) (1 << (X))
#endif #endif