mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-12 19:19:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 80a9abcfc8
1 changed files with 1 additions and 3 deletions
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_REALTIME 1 // #define CALENDAR_CLOCK 1 from mach/clock_types.h
#define CLOCK_MONOTONIC 0 // #define SYSTEM_CLOCK 0 #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 // 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; }; // struct timespec { time_t tv_sec; long tv_nsec; };
@ -68,7 +66,7 @@ typedef int clockid_t;
static double mt_timebase = 0.0; static double mt_timebase = 0.0;
static uint64_t mt_timestart = 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; kern_return_t retval = KERN_SUCCESS;
if (clk_id == TIMER_ABSTIME) if (clk_id == TIMER_ABSTIME)