commit 86fa7d16630c86eb58e8c50b81e2f43389e2a007
author Loo Rong Jie <loorongjie@gmail.com> Thu Sep 27 01:42:10 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Sep 27 01:43:36 2018 -0700
tree b78aca461fe1b3d72b6997ee2750f305ddd9d511
parent 21d2569909428cdaa269754f6127ca1c0613a055

[singlejar] Use gcc-style attr_packed for Clang on Windows

See #2241

Closes #6250.

PiperOrigin-RevId: 214738417

src/tools/singlejar/zip_headers.h

diff --git a/src/tools/singlejar/zip_headers.h b/src/tools/singlejar/zip_headers.h
index 3677a20..c76e15b 100644
--- a/src/tools/singlejar/zip_headers.h
+++ b/src/tools/singlejar/zip_headers.h
@@ -44,7 +44,7 @@
 #include <string>
 #include <type_traits>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma pack(push, 1)
 #define attr_packed
 #else
@@ -653,7 +653,7 @@
 } attr_packed;
 static_assert(56 == sizeof(ECD64), "ECD64 class fields layout is incorrect.");
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #pragma pack(pop)
 #endif