[syslinux:master] syslinux/pxe.h use the same type as <com32.h> for a far pointer
syslinux-bot for H. Peter Anvin
hpa at zytor.com
Sat Feb 6 17:48:12 PST 2010
Commit-ID: cc411e42caf7d7cd0847a592f107e97ea9f6bd65
Gitweb: http://syslinux.zytor.com/commit/cc411e42caf7d7cd0847a592f107e97ea9f6bd65
Author: H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sat, 6 Feb 2010 16:29:41 -0800
Committer: H. Peter Anvin <hpa at zytor.com>
CommitDate: Sat, 6 Feb 2010 16:29:41 -0800
syslinux/pxe.h use the same type as <com32.h> for a far pointer
<syslinux/pxe.h> was using segoff16_t, <com32.h> was using far_ptr_t
for the same thing -- use the same type so the macros are available
for both.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
com32/include/syslinux/pxe.h | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/com32/include/syslinux/pxe.h b/com32/include/syslinux/pxe.h
index 037642b..97f7c2b 100644
--- a/com32/include/syslinux/pxe.h
+++ b/com32/include/syslinux/pxe.h
@@ -37,6 +37,7 @@
#include <stdint.h>
#include <netinet/in.h>
#include <klibc/compiler.h>
+#include <com32.h>
/* PXE spec structures and definitions. These mostly follow the PXE
spec, except when the PXE spec is unnecessarily stupid. Of course,
@@ -57,10 +58,7 @@ typedef struct {
uint16_t segsize;
} __packed pxe_segdesc_t;
-typedef struct {
- uint16_t offs;
- uint16_t seg;
-} segoff16_t;
+typedef far_ptr_t segoff16_t;
typedef struct {
uint8_t opcode;
More information about the Syslinux-commits
mailing list