From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 26 Mar 2014 19:21:20 +0000 Subject: Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2. --- src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp') diff --git a/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp b/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp index 51b194d8..5107bc72 100644 --- a/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp +++ b/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -36,8 +36,8 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -/** Too lazy to include the right OS/2 header, duplicating the define we - * need here. */ +/** Too lazy to include the right OS/2 header, duplicating the define we + * need here. */ #define MY_SEM_INDEFINITE_WAIT UINT32_MAX @@ -56,7 +56,7 @@ uint32_t rtR0SemWaitOs2ConvertTimeout(uint32_t fFlags, uint64_t uTimeout) if (fFlags & RTSEMWAIT_FLAGS_INDEFINITE) return MY_SEM_INDEFINITE_WAIT; - if ( (fFlags & (RTSEMWAIT_FLAGS_MILLISECS | RTSEMWAIT_FLAGS_ABSOLUTE)) + if ( (fFlags & (RTSEMWAIT_FLAGS_MILLISECS | RTSEMWAIT_FLAGS_ABSOLUTE)) == RTSEMWAIT_FLAGS_MILLISECS) { if (uTimeout < UINT32_MAX) @@ -66,7 +66,7 @@ uint32_t rtR0SemWaitOs2ConvertTimeout(uint32_t fFlags, uint64_t uTimeout) if (!uTimeout) return 0; - + if (uTimeout == UINT64_MAX) return MY_SEM_INDEFINITE_WAIT; -- cgit v1.2.1