AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 19:39:53 +03:00
Code Releases Activity

Merge PR #672: Unix.c: remove macOS-specific UnixGetTick64() implementation

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-28 01:27:57 +02:00 committed by GitHub
commit 3f394d23c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mayaqua/Unix.c
View File

@ -128,8 +128,6 @@
#include <Mayaqua/Mayaqua.h> #include <Mayaqua/Mayaqua.h>
#ifdef UNIX_MACOS #ifdef UNIX_MACOS
#include <mach/clock.h>
#include <mach/mach.h>
#ifdef NO_VLAN #ifdef NO_VLAN
// Struct statfs for MacOS X // Struct statfs for MacOS X
typedef struct fsid { int32_t val[2]; } fsid_t; typedef struct fsid { int32_t val[2]; } fsid_t;
@ -2092,23 +2090,9 @@ UINT64 UnixGetTick64()
} }
return ret; return ret;
#else
#ifdef UNIX_MACOS
static clock_serv_t clock_serv = 0;
mach_timespec_t t;
UINT64 ret;
if (clock_serv == 0) {
host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &clock_serv);
}
clock_get_time(clock_serv, &t);
ret = ((UINT64)((UINT32)t.tv_sec)) * 1000LL + (UINT64)t.tv_nsec / 1000000LL;
return ret;
#else #else
return TickRealtimeManual(); return TickRealtimeManual();
#endif #endif
#endif
} }
// Get the system timer // Get the system timer