mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-04-23 04:40:07 +08:00
fix: QT complains about non-static data member initializers
This commit is contained in:
parent
f28da2da6e
commit
e449e2ba88
3 changed files with 10 additions and 64 deletions
|
@ -128,7 +128,7 @@ public:
|
||||||
void run();
|
void run();
|
||||||
private:
|
private:
|
||||||
char *script_cmds_file = NULL;
|
char *script_cmds_file = NULL;
|
||||||
bool usb_present = false;
|
bool usb_present;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PROXGUI_QT
|
#endif // PROXGUI_QT
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
|
|
||||||
//
|
|
||||||
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
||||||
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
||||||
// the license.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// platform-independant sleep macros
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
|
||||||
|
|
||||||
#define _POSIX_C_SOURCE 199309L
|
|
||||||
#include "sleep.h"
|
|
||||||
#include <time.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
void nsleep(uint64_t n) {
|
|
||||||
struct timespec timeout;
|
|
||||||
timeout.tv_sec = n/1000000000;
|
|
||||||
timeout.tv_nsec = n%1000000000;
|
|
||||||
while (nanosleep(&timeout, &timeout) && errno == EINTR);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // _WIN32
|
|
|
@ -1,27 +0,0 @@
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
|
|
||||||
//
|
|
||||||
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
||||||
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
||||||
// the license.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// platform-independant sleep macros
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#ifndef SLEEP_H__
|
|
||||||
#define SLEEP_H__
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
# include <windows.h>
|
|
||||||
# define sleep(n) Sleep(1000 * n)
|
|
||||||
# define msleep(n) Sleep(n)
|
|
||||||
#else
|
|
||||||
# include <inttypes.h>
|
|
||||||
# include <unistd.h>
|
|
||||||
void nsleep(uint64_t n);
|
|
||||||
# define msleep(n) nsleep(1000000 * n)
|
|
||||||
# define usleep(n) nsleep(1000 * n)
|
|
||||||
#endif // _WIN32
|
|
||||||
|
|
||||||
#endif // SLEEP_H__
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue