diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2012-06-11 13:14:06 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 13:13:56 (GMT) |
| commit | 59842a292cd68495fb009824cc417d492d3ffeb8 (patch) | |
| tree | 1b05da2b1b6e93fd6b96639d290086667efaa359 /src/corelib/arch | |
| parent | 2baea374eecc0d64dc5d69308bb1d446999d2898 (diff) | |
| download | Qt-59842a292cd68495fb009824cc417d492d3ffeb8.zip Qt-59842a292cd68495fb009824cc417d492d3ffeb8.tar.gz Qt-59842a292cd68495fb009824cc417d492d3ffeb8.tar.bz2 | |
VxWorks process (RTP) mode does not have taskLock/taskUnlock functions
VxWorks does not support to globally lock and unlock the scheduler from
process. In kernel mode (DKM) above functions disable preemption from
requested task and such functionality does not exist for process.
Change-Id: Id41eab4c1973e4181e82539d08707659e0780f99
(cherry picked from qtbase/49b8e21429c7ab785fb11e8ef84bd7e65c943861)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib/arch')
| -rw-r--r-- | src/corelib/arch/qatomic_vxworks.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h index 3164154..b437b9f 100644 --- a/src/corelib/arch/qatomic_vxworks.h +++ b/src/corelib/arch/qatomic_vxworks.h @@ -54,8 +54,13 @@ QT_BEGIN_HEADER # include <vxWorksCommon.h> # include <taskLib.h> #else +#if defined(_WRS_KERNEL) extern "C" int taskLock(); extern "C" int taskUnlock(); +#else +inline int taskLock() { return 0; } +inline int taskUnlock() { return 0; } +#endif #endif |