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

Merge PR #678: src/Mayaqua/Unix: remove unused code, improve readability of "ifdef"

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

17
src/Mayaqua/Unix.c
View File

@ -2060,12 +2060,6 @@ UINT64 UnixGetTick64()
struct timespec t; struct timespec t;
UINT64 ret; UINT64 ret;
static bool akirame = false;
if (akirame)
{
return TickRealtimeManual();
}
Zero(&t, sizeof(t)); Zero(&t, sizeof(t));
@ -2073,20 +2067,17 @@ UINT64 UnixGetTick64()
// Be careful. The Implementation is depend on the system. // Be careful. The Implementation is depend on the system.
#ifdef CLOCK_HIGHRES #ifdef CLOCK_HIGHRES
clock_gettime(CLOCK_HIGHRES, &t); clock_gettime(CLOCK_HIGHRES, &t);
#else // CLOCK_HIGHRES #elif CLOCK_MONOTONIC
#ifdef CLOCK_MONOTONIC
clock_gettime(CLOCK_MONOTONIC, &t); clock_gettime(CLOCK_MONOTONIC, &t);
#else // CLOCK_MONOTONIC #else
clock_gettime(CLOCK_REALTIME, &t); clock_gettime(CLOCK_REALTIME, &t);
#endif // CLOCK_MONOTONIC #endif
#endif // CLOCK_HIGHRES
ret = ((UINT64)((UINT32)t.tv_sec)) * 1000LL + (UINT64)t.tv_nsec / 1000000LL; ret = ((UINT64)((UINT32)t.tv_sec)) * 1000LL + (UINT64)t.tv_nsec / 1000000LL;
if (akirame == false && ret == 0) if (ret == 0)
{ {
ret = TickRealtimeManual(); ret = TickRealtimeManual();
akirame = true;
} }
return ret; return ret;