Fix build on Solaris-based systems

diff --git a/libarchive/archive_write_add_filter_xz.c b/libarchive/archive_write_add_filter_xz.c
index 46a6c38aa6e1a96e0af9812fc36cfe1fc834a2eb..b0f25a6ef0ed837243023f2f2518d49ff8ded6ae 100644 (file)
--- a/libarchive/archive_write_add_filter_xz.c
+++ b/libarchive/archive_write_add_filter_xz.c
@@ -233,7 +233,7 @@ archive_compressor_xz_init_stream(struct archive_write_filter *f,
        if (f->code == ARCHIVE_FILTER_XZ) {
 #ifdef HAVE_LZMA_STREAM_ENCODER_MT
                if (data->threads != 1) {
-                       bzero(&mt_options, sizeof(mt_options));
+                       memset(&mt_options, 0, sizeof(mt_options));
                        mt_options.threads = data->threads;
                        mt_options.timeout = 300;
                        mt_options.filters = data->lzmafilters;

diff --git a/libarchive/archive_write_set_format_xar.c b/libarchive/archive_write_set_format_xar.c
index ef9ad96ad51f758950e686fd035ba6a93966a092..c9f5ac23958238d9ae2565378a0fd8cc3b9b2238 100644 (file)
--- a/libarchive/archive_write_set_format_xar.c
+++ b/libarchive/archive_write_set_format_xar.c
@@ -2913,7 +2913,7 @@ compression_init_encoder_xz(struct archive *a,
        *strm = lzma_init_data;
 #ifdef HAVE_LZMA_STREAM_ENCODER_MT
        if (threads > 1) {
-               bzero(&mt_options, sizeof(mt_options));
+               memset(&mt_options, 0, sizeof(mt_options));
                mt_options.threads = threads;
                mt_options.timeout = 300;
                mt_options.filters = lzmafilters;

diff --git a/libarchive/xxhash.c b/libarchive/xxhash.c
index d7f8e96de6fb2a3c065eac639913286592fed2c8..e266bba48c822aab6f9252392cf75c55d688a401 100644 (file)
--- a/libarchive/xxhash.c
+++ b/libarchive/xxhash.c
@@ -29,10 +29,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 You can contact the author at :
 - xxHash source repository : http://code.google.com/p/xxhash/
 */
+#include "archive_platform.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "archive_platform.h"
 #include "archive_xxhash.h"
 
 #ifdef HAVE_LIBLZ4