Make sure that overzealous definition of __packed in <sys/cdefs.h>
doesn't break compilation with Microsoft compilers. Push/pop #pragma pack around <sys/bootblock.h>.
This commit is contained in:
parent
24798155ac
commit
2adc0e696d
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: disklabel.h,v 1.2 2003/10/08 04:25:44 lukem Exp $ */
|
||||
/* $NetBSD: disklabel.h,v 1.3 2004/04/26 22:27:43 uwe Exp $ */
|
||||
|
||||
/* Windows CE architecture */
|
||||
|
||||
|
@ -8,4 +8,16 @@
|
|||
#define RAW_PART 3 /* raw partition: XX?d (XXX) */
|
||||
|
||||
/* Pull in MBR partition definitions. */
|
||||
|
||||
#if !defined(__GNUC__)
|
||||
#include <sys/cdefs.h> /* force <sys/cdefs.h> to be read */
|
||||
#undef __packed /* so that we can undo the damage */
|
||||
#define __packed
|
||||
#pragma pack(push, _sys_bootblock_h, 1)
|
||||
#endif
|
||||
|
||||
#include <sys/bootblock.h>
|
||||
|
||||
#if !defined(__GNUC__)
|
||||
#pragma pack(pop, _sys_bootblock_h)
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue