mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 08:43:09 +00:00
Retire faked Windows version of gettimeofday()
Use equivalent Windows function _ftime() instead. This patch also removes two long standing warnings under MSVC. No functional change and no change for non-Windows systems. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
48b74142ef
commit
6bf22f354f
1 changed files with 13 additions and 29 deletions
42
src/misc.cpp
Normal file → Executable file
42
src/misc.cpp
Normal file → Executable file
|
@ -29,33 +29,10 @@
|
|||
# include <unistd.h>
|
||||
|
||||
#else
|
||||
/*
|
||||
(c) Copyright 1992 Eric Backus
|
||||
|
||||
This software may be used freely so long as this copyright notice is
|
||||
left intact. There is no warrantee on this software.
|
||||
*/
|
||||
# include <windows.h>
|
||||
# include <time.h>
|
||||
# include "dos.h"
|
||||
|
||||
static int gettimeofday(struct timeval* tp, struct timezone*)
|
||||
{
|
||||
SYSTEMTIME systime;
|
||||
|
||||
if (tp)
|
||||
{
|
||||
struct tm tmrec;
|
||||
time_t theTime = time(NULL);
|
||||
|
||||
tmrec = *localtime(&theTime);
|
||||
tp->tv_sec = mktime(&tmrec);
|
||||
GetLocalTime(&systime); /* system time */
|
||||
|
||||
tp->tv_usec = systime.wMilliseconds * 1000;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#define _CRT_SECURE_NO_DEPRECATE
|
||||
#include <windows.h>
|
||||
#include <sys/timeb.h>
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -189,9 +166,16 @@ const string engine_name() {
|
|||
/// milliseconds.
|
||||
|
||||
int get_system_time() {
|
||||
struct timeval t;
|
||||
gettimeofday(&t, NULL);
|
||||
return t.tv_sec*1000 + t.tv_usec/1000;
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
struct _timeb t;
|
||||
_ftime(&t);
|
||||
return int(t.time*1000 + t.millitm);
|
||||
#else
|
||||
struct timeval t;
|
||||
gettimeofday(&t, NULL);
|
||||
return t.tv_sec*1000 + t.tv_usec/1000;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue