summaryrefslogtreecommitdiff
path: root/firmware/lib/cgptlib
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2010-06-23 12:43:01 -0700
committerRandall Spangler <rspangler@chromium.org>2010-06-23 12:43:01 -0700
commitb9d60a52b7760d32d3592a76dccb6d6cefd85272 (patch)
tree2c9733d34d001146818779133d9ffa77fba916c9 /firmware/lib/cgptlib
parent249677d0ad8caa2764b2bbfafb418cf04f63a393 (diff)
downloadvboot-b9d60a52b7760d32d3592a76dccb6d6cefd85272.tar.gz
Even more integration fixes.
Review URL: http://codereview.chromium.org/2849021
Diffstat (limited to 'firmware/lib/cgptlib')
-rw-r--r--firmware/lib/cgptlib/include/gpt.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/firmware/lib/cgptlib/include/gpt.h b/firmware/lib/cgptlib/include/gpt.h
index 79cc8b2b..1d5cb58d 100644
--- a/firmware/lib/cgptlib/include/gpt.h
+++ b/firmware/lib/cgptlib/include/gpt.h
@@ -12,7 +12,9 @@
#include "sysincludes.h"
-PACK_START /* Support packing for MSVC */
+#ifdef _MSC_VER
+#pragma pack(push,1) /* Support packing for MSVC. */
+#endif
#define GPT_HEADER_SIGNATURE "EFI PART"
#define GPT_HEADER_SIGNATURE_SIZE sizeof(GPT_HEADER_SIGNATURE)
@@ -115,6 +117,8 @@ typedef struct {
#define GPTENTRY_EXPECTED_SIZE 128
-PACK_STOP /* Support packing for MSVC */
+#ifdef _MSC_VER
+#pragma pack(pop) /* Support packing for MSVC. */
+#endif
#endif /* VBOOT_REFERENCE_CGPTLIB_GPT_H_ */