aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-06 16:29:41 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-06 16:29:41 -0800
commitcc411e42caf7d7cd0847a592f107e97ea9f6bd65 (patch)
tree41b6a1fd0433667f9150bcc381c7524925fded42
parentec7ce064361a4900d27bfe4a2040d4443ca2519c (diff)
downloadsyslinux.git-cc411e42caf7d7cd0847a592f107e97ea9f6bd65.tar.gz
syslinux.git-cc411e42caf7d7cd0847a592f107e97ea9f6bd65.tar.xz
syslinux.git-cc411e42caf7d7cd0847a592f107e97ea9f6bd65.zip
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@zytor.com>
-rw-r--r--com32/include/syslinux/pxe.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/com32/include/syslinux/pxe.h b/com32/include/syslinux/pxe.h
index 037642bc..97f7c2b9 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;