diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Runtime/os2 | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Runtime/os2')
| -rw-r--r-- | src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp | 2 | ||||
| -rw-r--r-- | src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp | 10 | ||||
| -rw-r--r-- | src/VBox/Runtime/os2/sys0.asm | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp index edbfb331..e8b61f2e 100644 --- a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp +++ b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; 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; diff --git a/src/VBox/Runtime/os2/sys0.asm b/src/VBox/Runtime/os2/sys0.asm index 476a5b50..32b431c5 100644 --- a/src/VBox/Runtime/os2/sys0.asm +++ b/src/VBox/Runtime/os2/sys0.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; |