From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 18 Jun 2017 16:48:49 +0000 (+0200)
Subject: Remove use of #pragma pack in lib/lz4.c for Solaris 10
X-Git-Tag: Release-9.0.0~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1a93a78f8109c5bf414cd4374eb205defcb7da2f;p=bacula%2Fbacula

Remove use of #pragma pack in lib/lz4.c for Solaris 10
---

diff --git a/bacula/src/lib/lz4.c b/bacula/src/lib/lz4.c
index 1e174016c3..e2858417f5 100644
--- a/bacula/src/lib/lz4.c
+++ b/bacula/src/lib/lz4.c
@@ -29,6 +29,9 @@
    You can contact the author at :
    - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
    - LZ4 source repository : http://code.google.com/p/lz4/
+
+   #ifdef out #pragma pack on Solaris 10 -- KES 18 Jun 2017
+
 */
 
 #include "config.h"
@@ -170,7 +173,7 @@ Note : this source file requires "lz4_encoder.h"
 #  define _PACKED
 #endif
 
-#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) && !defined(HAVE_SOLARIS10)
 #  pragma pack(push, 1)
 #endif
 
@@ -178,7 +181,7 @@ 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__)
+#if !defined(LZ4_FORCE_UNALIGNED_ACCESS) && !defined(__GNUC__) && !defined(HAVE_SOLARIS10)
 #  pragma pack(pop)
 #endif
 
@@ -682,4 +685,3 @@ int LZ4_decompress_safe_partial(const char* source, char* dest, int inputSize, i
 {
     return LZ4_decompress_generic(source, dest, inputSize, maxOutputSize, endOnInputSize, noPrefix, partial, targetOutputSize);
 }
-