diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-12-24 17:49:58 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-12-24 17:49:58 +0000 |
| commit | 23883d60d78f152827edcbff4f8ac8040ef8cdb5 (patch) | |
| tree | 77afe71ab3cee92be070ab4a93b9b18cc58c2fed /nuttx/sched/sig_timedwait.c | |
| parent | 50cadb430489789f1d42d6f8b17f09470a409f14 (diff) | |
| download | px4-nuttx-23883d60d78f152827edcbff4f8ac8040ef8cdb5.tar.gz px4-nuttx-23883d60d78f152827edcbff4f8ac8040ef8cdb5.tar.bz2 px4-nuttx-23883d60d78f152827edcbff4f8ac8040ef8cdb5.zip | |
Fixes for l3s, USB composite, nfsmount, apps context build problems
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5458 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/sig_timedwait.c')
| -rw-r--r-- | nuttx/sched/sig_timedwait.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/sched/sig_timedwait.c b/nuttx/sched/sig_timedwait.c index d03611610..d7610cd49 100644 --- a/nuttx/sched/sig_timedwait.c +++ b/nuttx/sched/sig_timedwait.c @@ -38,6 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> +#include <nuttx/compiler.h> #include <stdint.h> #include <string.h> @@ -244,8 +245,8 @@ int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *info, */ #ifdef CONFIG_HAVE_LONG_LONG - uint64_t waitticks64 = (timeout->tv_sec * NSEC_PER_SEC + - timeout->tv_nsec + NSEC_PER_TICK - 1) / + uint64_t waitticks64 = ((uint64_t)timeout->tv_sec * NSEC_PER_SEC + + (uint64_t)timeout->tv_nsec + NSEC_PER_TICK - 1) / NSEC_PER_TICK; DEBUGASSERT(waitticks64 <= UINT32_MAX); waitticks = (uint32_t)waitticks64; |