[syslinux:firmware] com32.h: Fix MK_PTR() for 64-bit

syslinux-bot for Matt Fleming matt.fleming at intel.com
Fri Nov 9 09:06:32 PST 2012


Commit-ID:  ace4b38935a892d72aa5935cdc5a8153d9b4e5d0
Gitweb:     http://www.syslinux.org/commit/ace4b38935a892d72aa5935cdc5a8153d9b4e5d0
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Fri, 19 Oct 2012 17:02:37 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Fri, 26 Oct 2012 16:35:48 +0100

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 at intel.com>

---
 com32/include/com32.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/com32/include/com32.h b/com32/include/com32.h
index 7ca187a..c5d6017 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 */


More information about the Syslinux-commits mailing list