From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 19 Jun 2017 08:09:34 +0000 (+0200)
Subject: A more correct fix for lz4.c on Solaris 10
X-Git-Tag: Release-9.0.0~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c3741073fa5b44718d539199194eef59a7a2617;p=bacula%2Fbacula

A more correct fix for lz4.c on Solaris 10
---

diff --git a/bacula/src/lib/lz4.c b/bacula/src/lib/lz4.c
index e2858417f5..62a4aed490 100644
--- a/bacula/src/lib/lz4.c
+++ b/bacula/src/lib/lz4.c
@@ -173,7 +173,9 @@ Note : this source file requires "lz4_encoder.h"
 #  define _PACKED
 #endif
 
-#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) && !defined(HAVE_SOLARIS10)
+#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) && defined(HAVE_SOLARIS10)
+#  pragma pack(1)
+#elif !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__)
 #  pragma pack(push, 1)
 #endif
 
@@ -181,7 +183,9 @@ typedef struct _U16_S { U16 v; } _PACKED U16_S;
 typedef struct _U32_S { U32 v; } _PACKED U32_S;
 typedef struct _U64_S { U64 v; } _PACKED U64_S;
 
-#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) && !defined(HAVE_SOLARIS10)
+#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) && defined(HAVE_SOLARIS10)
+#  pragma pack()
+#elif !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__)
 #  pragma pack(pop)
 #endif