From 343dd145fd7f5d39f026746e9f7494658fca931f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
Date: Sat, 29 Dec 2007 16:36:35 +0000
Subject: [PATCH] fix typo causing build failure with Sun's cc on Solaris. Add
 missing pack pragmas.

git-svn: trunk@3470
---
 ChangeLog            |  5 +++++
 libclamav/msexpand.c | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1a01bb52b..a2729527f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 29 18:01:35 EET 2007 (edwin)
+------------------------------------
+ * libclamav/msexpand.c: fix typo causing build failure with Sun's cc on
+ Solaris. Add missing pack pragmas.
+
 Sat Dec 29 15:05:11 GMT 2007 (njh)
 ----------------------------------
   * clamav-milter:	Correct nul termination in ping response from clamd
diff --git a/libclamav/msexpand.c b/libclamav/msexpand.c
index f31862c5b..a1e3e8dad 100644
--- a/libclamav/msexpand.c
+++ b/libclamav/msexpand.c
@@ -37,6 +37,14 @@
 #define __attribute__(x)
 #endif
 
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK_HPPA
+#pragma pack 1
+#endif
+
 #define EC32(x) le32_to_host(x)
 #define EC16(x) le16_to_host(x)
 
@@ -49,7 +57,15 @@ struct msexp_hdr {
     uint32_t magic2;
     uint16_t magic3;
     uint32_t fsize;
-} __attribute((packed));
+} __attribute__((packed));
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack()
+#endif
+
+#ifdef HAVE_PRAGMA_PACK_HPPA
+#pragma pack
+#endif
 
 #define BSIZE 4096
 #define RWBUFF 2048