pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove deprecated ftime() function

Browse source 
Replaced with clock_gettime()
This commit is contained in:
Dimitris Panokostas 2020-08-23 16:02:24 +02:00
parent 3871845261
commit 385ecc296e
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/blkdev_cdimage.cpp
View file

@ -490,7 +490,7 @@ static bool cdda_play_func2 (struct cdunit *cdu, int *outpos)
struct _timeb tb1, tb2;
#else
#ifdef HAVE_SYS_TIMEB_H
struct timeb tb1, tb2;
struct timespec ts1, ts2;
#else
#warning Missing timing functions
#endif
@ -500,7 +500,7 @@ static bool cdda_play_func2 (struct cdunit *cdu, int *outpos)
silentframes = 0;
foundsub = false;
#ifdef HAVE_SYS_TIMEB_H
_ftime (&tb1);
clock_gettime(CLOCK_REALTIME, &ts1);
#endif
cdda_pos = cdu->cdda_start;
oldplay = cdu->cdda_play;
@ -557,9 +557,9 @@ static bool cdda_play_func2 (struct cdunit *cdu, int *outpos)
if (*outpos < 0) {
#ifdef HAVE_SYS_TIMEB_H
_ftime (&tb2);
diff = (tb2.time * (uae_s64)1000 + tb2.millitm) - (tb1.time * (uae_s64)1000 + tb1.millitm);
diff -= cdu->cdda_delay;
clock_gettime(CLOCK_REALTIME, &ts2);
diff = (ts2.tv_sec * (uae_s64)1000 + (ts2.tv_nsec / 1000000) - (ts1.tv_sec * (uae_s64)1000 + (ts1.tv_nsec / 1000000)));
diff -= cdu->cdda_delay;
#else
diff = 0;
#endif

3
src/osdep/sysconfig.h
View file

@ -564,9 +564,6 @@ typedef char TCHAR;
#define _tzset() tzset()
#define _timezone timezone
#define _daylight daylight
#ifndef _ftime
#define _ftime(x) ftime(x)
#endif
#ifdef ANDROID
#define _ftelli64(x) ftello(x)
#define _fseeki64(x,y,z) fseeko(x,y,z)