aboutsummaryrefslogtreecommitdiffstats
path: root/dosutil
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-06-21 17:29:11 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-21 17:29:11 -0700
commit7556a891b2f28617f6c95aa271aeaf29883d0981 (patch)
tree703e50c4970c9e64f2e11f76e81001af8fb7d33e /dosutil
parent3df42588472b07c54b9de11a7e118d6f3f4f6c41 (diff)
downloadsyslinux-7556a891b2f28617f6c95aa271aeaf29883d0981.tar.gz
syslinux-7556a891b2f28617f6c95aa271aeaf29883d0981.tar.xz
syslinux-7556a891b2f28617f6c95aa271aeaf29883d0981.zip
memdisk: make mstructs.h includable from Linux
Make mstructs.h includable from a Linux utility. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'dosutil')
-rw-r--r--dosutil/mdiskchk.c6
-rw-r--r--dosutil/mdiskchk.combin8246 -> 8106 bytes
2 files changed, 1 insertions, 5 deletions
diff --git a/dosutil/mdiskchk.c b/dosutil/mdiskchk.c
index f7bde614..47bb08e5 100644
--- a/dosutil/mdiskchk.c
+++ b/dosutil/mdiskchk.c
@@ -31,10 +31,6 @@ typedef unsigned long uint32_t;
typedef unsigned short uint16_t;
typedef unsigned char uint8_t;
-/* OpenWatcom uses a packed structure prefix */
-#define MEMDISK_PACKED_PREFIX _Packed
-#define MEMDISK_PACKED_POSTFIX
-
/* Pull in MEMDISK common structures */
#include "../memdisk/mstructs.h"
@@ -277,7 +273,7 @@ static MDISKCHK_FUNC_DECL(show_safe_hooks)
struct patch_area far *patch_area;
/* Copy the MDI from the mBFT. Offset is a misnomer here */
- mbft = MK_FP(hook->mBFT.offset >> 4, 0); /* Always aligned */
+ mbft = MK_FP(hook->mbft >> 4, 0); /* Always aligned */
_fmemcpy((void far *)&m, &mbft->mdi, sizeof(struct mdi));
/* Adjust C/H/S since we actually know
* it directly for any MEMDISK with an mBFT
diff --git a/dosutil/mdiskchk.com b/dosutil/mdiskchk.com
index b18a187c..22ccfe5f 100644
--- a/dosutil/mdiskchk.com
+++ b/dosutil/mdiskchk.com
Binary files differ