@@ -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

@@ -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