aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-19 17:02:37 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-26 16:35:48 +0100
commitace4b38935a892d72aa5935cdc5a8153d9b4e5d0 (patch)
tree4b7d491776c0aeea343284dcf8aef2c009633ee1
parenta1407bcae4d797c491ae06d1ae7bb574fb4ea13f (diff)
downloadsyslinux-ace4b38935a892d72aa5935cdc5a8153d9b4e5d0.tar.gz
syslinux-ace4b38935a892d72aa5935cdc5a8153d9b4e5d0.tar.xz
syslinux-ace4b38935a892d72aa5935cdc5a8153d9b4e5d0.zip
com32.h: Fix MK_PTR() for 64-bit
In the future we need 32/64-bit EFI to simply not include this file at all. For now, just fixup the warning about casting integers to pointers of different size. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/include/com32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/include/com32.h b/com32/include/com32.h
index 7ca187a5..c5d60176 100644
--- a/com32/include/com32.h
+++ b/com32/include/com32.h
@@ -176,7 +176,7 @@ static inline bool _OFFS_VALID(const volatile void *__p, size_t __s,
static inline void *MK_PTR(uint16_t __seg, uint16_t __offs)
{
- return (void *)((__seg << 4) + __offs);
+ return (void *)(unsigned long)((__seg << 4) + __offs);
}
/* Some tools to handle 16:16 far pointers in memory */