Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: firmware/lib/cgptlib/include/gpt.h

Issue 2849021: Even more integration fixes. (Closed) Base URL: ssh://gitrw.chromium.org/vboot_reference.git
Patch Set: (resend to gen email) Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « firmware/include/sysincludes.h ('k') | firmware/lib/include/vboot_struct.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firmware/lib/cgptlib/include/gpt.h
diff --git a/firmware/lib/cgptlib/include/gpt.h b/firmware/lib/cgptlib/include/gpt.h
index 79cc8b2b0d454bc4dd73afbcdf5ab186bf830c08..1d5cb58df071ad3c4e2b91c82e311f53a872c96f 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_ */
« no previous file with comments | « firmware/include/sysincludes.h ('k') | firmware/lib/include/vboot_struct.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698