summaryrefslogtreecommitdiff
path: root/common/util.c
diff options
context:
space:
mode:
authorVic Yang <victoryang@chromium.org>2013-05-08 04:50:56 +0800
committerChromeBot <chrome-bot@google.com>2013-05-07 20:59:53 -0700
commit5007bbc009ccc8c8e64fac5f5540c85573d4ae80 (patch)
treeb0e7f1c5d4bd2ec286d8866759711b30cb5345a2 /common/util.c
parent235e6e1d0d713ddad79fa77d6982c006378053cd (diff)
downloadchrome-ec-5007bbc009ccc8c8e64fac5f5540c85573d4ae80.tar.gz
Use uintptr_t when converting integer from/to pointer
Perviously we use uint32_t for this, but this doesn't compile for 64-bit environment (and likely doesn't for 16-bit either.) Use uintptr_t so that we don't get size mismatch errors. BUG=chrome-os-partner:19257 TEST=Run host emulated tests BRANCH=None Change-Id: I3cd66a745fa171c41a5f142514284ec106586acb Signed-off-by: Vic Yang <victoryang@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/50358 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common/util.c')
-rw-r--r--common/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/util.c b/common/util.c
index d8670759c1..5ccebeb063 100644
--- a/common/util.c
+++ b/common/util.c
@@ -196,8 +196,8 @@ void *memset(void *dest, int c, int len)
void *memmove(void *dest, const void *src, int len)
{
- if ((uint32_t)dest <= (uint32_t)src ||
- (uint32_t)dest >= (uint32_t)src + len) {
+ if ((uintptr_t)dest <= (uintptr_t)src ||
+ (uintptr_t)dest >= (uintptr_t)src + len) {
/* Start of destination doesn't overlap source, so just use
* memcpy(). */
return memcpy(dest, src, len);