diff --git a/arangod/Replication/Syncer.h b/arangod/Replication/Syncer.h index 5dbfdba92c..55e54db914 100644 --- a/arangod/Replication/Syncer.h +++ b/arangod/Replication/Syncer.h @@ -64,11 +64,7 @@ class Syncer { ////////////////////////////////////////////////////////////////////////////// void sleep(uint64_t time) { -#ifdef _WIN32 - usleep((unsigned long)time); -#else - usleep((useconds_t)time); -#endif + usleep(static_cast(time)); } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/Statistics/StatisticsFeature.cpp b/arangod/Statistics/StatisticsFeature.cpp index c59140642d..f640d19be4 100644 --- a/arangod/Statistics/StatisticsFeature.cpp +++ b/arangod/Statistics/StatisticsFeature.cpp @@ -89,12 +89,7 @@ class arangodb::StatisticsThread final : public Thread { } } -#ifdef _WIN32 - usleep((unsigned long)sleepTime); -#else - usleep((useconds_t)sleepTime); -#endif - + usleep(static_cast(sleepTime)); } else { nothingHappened = 0; diff --git a/arangod/VocBase/replication-applier.cpp b/arangod/VocBase/replication-applier.cpp index 6619a7d857..6a61c347b9 100644 --- a/arangod/VocBase/replication-applier.cpp +++ b/arangod/VocBase/replication-applier.cpp @@ -1181,12 +1181,7 @@ bool TRI_replication_applier_t::wait(uint64_t sleepTime) { static uint64_t const SleepChunk = 500 * 1000; while (sleepTime >= SleepChunk) { -#ifdef _WIN32 - usleep((unsigned long)SleepChunk); -#else - usleep((useconds_t)SleepChunk); -#endif - + usleep(static_cast(SleepChunk)); sleepTime -= SleepChunk; if (isTerminated()) { @@ -1195,11 +1190,7 @@ bool TRI_replication_applier_t::wait(uint64_t sleepTime) { } if (sleepTime > 0) { -#ifdef _WIN32 - usleep((unsigned long)sleepTime); -#else - usleep((useconds_t)sleepTime); -#endif + usleep(static_cast(sleepTime)); if (isTerminated()) { return false; diff --git a/lib/Basics/ReadWriteLock.cpp b/lib/Basics/ReadWriteLock.cpp index d0cb285b6e..5271b19378 100644 --- a/lib/Basics/ReadWriteLock.cpp +++ b/lib/Basics/ReadWriteLock.cpp @@ -65,11 +65,7 @@ bool ReadWriteLock::tryReadLock(uint64_t sleepTime) { return true; } -#ifdef _WIN32 - usleep((unsigned long)sleepTime); -#else - usleep((useconds_t)sleepTime); -#endif + usleep(static_cast(sleepTime)); } } @@ -107,11 +103,7 @@ bool ReadWriteLock::tryWriteLock(uint64_t sleepTime) { return true; } -#ifdef _WIN32 - usleep((unsigned long)sleepTime); -#else - usleep((useconds_t)sleepTime); -#endif + usleep(static_cast(sleepTime)); } } diff --git a/lib/Basics/operating-system.h b/lib/Basics/operating-system.h index cecdd9b3b9..26935a42e0 100644 --- a/lib/Basics/operating-system.h +++ b/lib/Basics/operating-system.h @@ -179,6 +179,7 @@ #define TRI_UNLINK ::unlink #define TRI_WRITE ::write +#define TRI_usleep_t useconds_t #define TRI_lseek_t off_t #define TRI_read_t size_t #define TRI_stat_t struct stat @@ -335,6 +336,7 @@ #define TRI_UNLINK ::unlink #define TRI_WRITE ::write +#define TRI_usleep_t useconds_t #define TRI_lseek_t off_t #define TRI_read_t size_t #define TRI_stat_t struct stat @@ -478,6 +480,7 @@ #define TRI_UNLINK ::unlink #define TRI_WRITE ::write +#define TRI_usleep_t useconds_t #define TRI_lseek_t off_t #define TRI_read_t size_t #define TRI_stat_t struct stat @@ -640,6 +643,7 @@ #define TRI_UNLINK ::unlink #define TRI_WRITE ::write +#define TRI_usleep_t useconds_t #define TRI_lseek_t off_t #define TRI_read_t size_t #define TRI_stat_t struct stat @@ -835,6 +839,7 @@ typedef unsigned char bool; #define TRI_UNLINK ::_unlink #define TRI_WRITE ::_write +#define TRI_usleep_t unsigned long #define TRI_lseek_t __int64 #define TRI_read_t unsigned int #define TRI_stat_t struct _stat64 diff --git a/lib/SimpleHttpClient/SimpleHttpClient.cpp b/lib/SimpleHttpClient/SimpleHttpClient.cpp index 1608babbab..62ed5e1733 100644 --- a/lib/SimpleHttpClient/SimpleHttpClient.cpp +++ b/lib/SimpleHttpClient/SimpleHttpClient.cpp @@ -183,11 +183,7 @@ SimpleHttpResult* SimpleHttpClient::retryRequest( << " - retries left: " << (_maxRetries - tries); } -#ifdef _WIN32 - usleep((unsigned long)_retryWaitTime); -#else - usleep((useconds_t)_retryWaitTime); -#endif + usleep(static_cast(_retryWaitTime)); } return result; diff --git a/lib/V8/v8-utils.cpp b/lib/V8/v8-utils.cpp index 44772a61f6..1c6dad1bb8 100644 --- a/lib/V8/v8-utils.cpp +++ b/lib/V8/v8-utils.cpp @@ -3083,11 +3083,7 @@ static void JS_Sleep(v8::FunctionCallbackInfo const& args) { ? 500000 : static_cast((until - now) * 1000000); -#ifdef _WIN32 - usleep(static_cast(duration)); -#else - usleep(duration); -#endif + usleep(static_cast(duration)); } TRI_V8_RETURN_UNDEFINED();