github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-11 15:56:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile errors with MacOS (#312)

Browse source 
* Fix compile errors with MacOS
- _POSIX_C_SOURCE must not be defined for num_CPU()

* separate util_posix.c require changes in tools directory as well

* remove unnecessary self-include
This commit is contained in:
pwpiwi 2017-06-07 22:35:20 +02:00 • committed by GitHub
parent f9a12dfac2
commit ec9c71129f
17 changed files with 109 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

50
client/util.c
View file

@ -8,10 +8,6 @@
// utilities
//-----------------------------------------------------------------------------
#if !defined(_WIN32)
#define _POSIX_C_SOURCE 199309L // need nanosleep()
#endif
#include "util.h"
#include <stdint.h>
@ -22,6 +18,10 @@
#include <time.h>
#include "data.h"
#ifdef _WIN32
#include <windows.h>
#endif
#define MAX_BIN_BREAK_LENGTH (3072+384+1)
#ifndef _WIN32
@ -614,48 +614,7 @@ void clean_ascii(unsigned char *buf, size_t len) {
}
// Timer functions
#if !defined (_WIN32)
#include <errno.h>
static void nsleep(uint64_t n) {
struct timespec timeout;
timeout.tv_sec = n/1000000000;
timeout.tv_nsec = n%1000000000;
while (nanosleep(&timeout, &timeout) && errno == EINTR);
}
void msleep(uint32_t n) {
nsleep(1000000 * n);
}
#endif // _WIN32
// a milliseconds timer for performance measurement
uint64_t msclock() {
#if defined(_WIN32)
#include <sys/types.h>
// WORKAROUND FOR MinGW (some versions - use if normal code does not compile)
// It has no _ftime_s and needs explicit inclusion of timeb.h
#include <sys/timeb.h>
struct _timeb t;
_ftime(&t);
return 1000 * t.time + t.millitm;
// NORMAL CODE (use _ftime_s)
//struct _timeb t;
//if (_ftime_s(&t)) {
// return 0;
//} else {
// return 1000 * t.time + t.millitm;
//}
#else
struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t);
return (t.tv_sec * 1000 + t.tv_nsec / 1000000);
#endif
}
// determine number of logical CPU cores (use for multithreaded functions)
extern int num_CPUs(void)
@ -672,3 +631,4 @@ extern int num_CPUs(void)
return 1;
#endif
}