RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

fix type conflict with macOS (#2157)

Browse Source
This commit is contained in:
Yishuai Li 2016-10-19 09:21:45 -04:00 committed by Ivan
parent 2c803dbe66
commit 80a9abcfc8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Cell/lv2/sys_time.cpp
View File

@ -49,8 +49,6 @@ const auto s_time_aux_info = []() -> time_aux_info_t
#define CLOCK_REALTIME 1 // #define CALENDAR_CLOCK 1 from mach/clock_types.h
#define CLOCK_MONOTONIC 0 // #define SYSTEM_CLOCK 0
typedef int clockid_t;
// the mach kernel uses struct mach_timespec, so struct timespec is loaded from <sys/_types/_timespec.h> for compatability
// struct timespec { time_t tv_sec; long tv_nsec; };
@ -68,7 +66,7 @@ typedef int clockid_t;
static double mt_timebase = 0.0;
static uint64_t mt_timestart = 0;
static int clock_gettime(clockid_t clk_id, struct timespec* tp)
static int clock_gettime(int clk_id, struct timespec* tp)
{
kern_return_t retval = KERN_SUCCESS;
if (clk_id == TIMER_ABSTIME)