[src/trunk]: src/sys/arch/hpc/stand/include/machine Make sure that overzealou...

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/deeed2a90d28
branches:  trunk
changeset: 566065:deeed2a90d28
user:      uwe <uwe%NetBSD.org@localhost>
date:      Mon Apr 26 22:27:43 2004 +0000

description:
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>.

diffstat:

 sys/arch/hpc/stand/include/machine/disklabel.h |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 5118c6f867b8 -r deeed2a90d28 sys/arch/hpc/stand/include/machine/disklabel.h
--- a/sys/arch/hpc/stand/include/machine/disklabel.h    Mon Apr 26 22:25:54 2004 +0000
+++ b/sys/arch/hpc/stand/include/machine/disklabel.h    Mon Apr 26 22:27:43 2004 +0000
@@ -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