summaryrefslogtreecommitdiff
path: root/ioshark
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2018-01-09 19:59:55 -0800
committerYi Kong <yikong@google.com>2018-01-09 20:10:25 -0800
commit4e80f59db660505102dae427ad4a7904a951019f (patch)
treec6f6ac5d9b2c917c1f1d156bc193e3df50601902 /ioshark
parent5ce56821e99ee7b10de58b4b7a339d8844f9463b (diff)
downloadextras-4e80f59db660505102dae427ad4a7904a951019f.tar.gz
Use '#pragma pack(pop)' instead of reset
Resetting alignment in an include file can have unintended side-effects. Pop the option instead. This fixes newly introduced '-Wpragma-pack' warning in Clang. Test: m checkbuild Change-Id: Ifacc486491b893e3339b0775f5b0ac7ba7990ac0
Diffstat (limited to 'ioshark')
-rw-r--r--ioshark/ioshark.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ioshark/ioshark.h b/ioshark/ioshark.h
index 33e9f98c..2e87b563 100644
--- a/ioshark/ioshark.h
+++ b/ioshark/ioshark.h
@@ -21,7 +21,7 @@
* 3) Table of IO operations to perform on the files
*/
-#pragma pack(1)
+#pragma pack(push, 1)
/*
* The parsed workload file starts off with the header, which
@@ -126,4 +126,4 @@ struct ioshark_filename_struct
char path[MAX_IOSHARK_PATHLEN];
};
-#pragma options align=reset
+#pragma pack(pop)