generalize usleep argument

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<TRI_usleep_t>(time));
   }
 
   ////////////////////////////////////////////////////////////////////////////////

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<TRI_usleep_t>(sleepTime));
       } else {
         nothingHappened = 0;
 

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<TRI_usleep_t>(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<TRI_usleep_t>(sleepTime));
 
       if (isTerminated()) {
         return false;

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<TRI_usleep_t>(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<TRI_usleep_t>(sleepTime));
   }
 }
 

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

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<TRI_usleep_t>(_retryWaitTime));
   }
 
   return result;

lib/V8/v8-utils.cpp

@@ -3083,11 +3083,7 @@ static void JS_Sleep(v8::FunctionCallbackInfo<v8::Value> const& args) {
                             ? 500000
                             : static_cast<uint64_t>((until - now) * 1000000);
 
-#ifdef _WIN32
-    usleep(static_cast<unsigned long>(duration));
-#else
-    usleep(duration);
-#endif
+    usleep(static_cast<TRI_usleep_t>(duration));
   }
 
   TRI_V8_RETURN_UNDEFINED();