diff options
| author | Eric Engestrom <[email protected]> | 2019-08-01 22:49:05 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-08-02 18:38:52 +0100 |
| commit | 8c52bca11228a7d514cfbcb1c6605c2140949b06 (patch) | |
| tree | c9b3907bc08fd4997ec4c3387f96f1f3b939fd6d /src/util/os_time.c | |
| parent | e740e7a6f018738b02ce97db172d6749feeadce1 (diff) | |
gallium/utils: drop PIPE_SUBSYSTEM_WINDOWS_USER
This is basically just an alias for PIPE_OS_WINDOWS.
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/util/os_time.c')
| -rw-r--r-- | src/util/os_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util/os_time.c b/src/util/os_time.c index ac488b2287c..22195c5a669 100644 --- a/src/util/os_time.c +++ b/src/util/os_time.c @@ -45,7 +45,7 @@ # include <sys/time.h> /* timeval */ # include <sched.h> /* sched_yield */ # include <errno.h> -#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) +#elif DETECT_OS_WINDOWS # include <windows.h> #else # error Unsupported OS @@ -67,7 +67,7 @@ os_time_get_nano(void) gettimeofday(&tv, NULL); return tv.tv_usec*INT64_C(1000) + tv.tv_sec*INT64_C(1000000000); -#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) +#elif DETECT_OS_WINDOWS static LARGE_INTEGER frequency; LARGE_INTEGER counter; @@ -104,7 +104,7 @@ os_time_sleep(int64_t usecs) #elif defined(PIPE_OS_UNIX) usleep(usecs); -#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER) +#elif DETECT_OS_WINDOWS DWORD dwMilliseconds = (DWORD) ((usecs + 999) / 1000); /* Avoid Sleep(O) as that would cause to sleep for an undetermined duration */ if (dwMilliseconds) { |