Make these files compile with C++.

2 files changed, 6 insertions, 6 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 8a1ccf8..0e16e53 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1256,14 +1256,14 @@ main_print_window (xd3_stream* stream, main_file *xfile)
 
       VC(UT "  %06"Q"u %03u  %s %3u", stream->dec_winstart + size, 
          option_print_cpymode ? code : 0,
-         xd3_rtype_to_string (stream->dec_current1.type, option_print_cpymode),
+         xd3_rtype_to_string ((xd3_rtype) stream->dec_current1.type, option_print_cpymode),
          (usize_t) stream->dec_current1.size)VE;
 
       if (stream->dec_current1.type != XD3_NOOP)
         {
           if (stream->dec_current1.type >= XD3_CPY)
             {
-              VC(UT " @%-"Q"6u", 
+              VC(UT " @%-6"Q"u", 
                  stream->dec_cpyoff + stream->dec_current1.addr)VE;
             }
           else
@@ -1277,7 +1277,7 @@ main_print_window (xd3_stream* stream, main_file *xfile)
       if (stream->dec_current2.type != XD3_NOOP)
         {
           VC(UT "  %s %3u",
-             xd3_rtype_to_string (stream->dec_current2.type,
+             xd3_rtype_to_string ((xd3_rtype) stream->dec_current2.type,
                                   option_print_cpymode),
              (usize_t)stream->dec_current2.size)VE;
 
@@ -1355,7 +1355,7 @@ main_print_func (xd3_stream* stream, main_file *xfile)
 
   if (xfile->snprintf_buf == NULL)
     {
-      if ((xfile->snprintf_buf = main_malloc(SNPRINTF_BUFSIZE)) == NULL)
+      if ((xfile->snprintf_buf = (uint8_t*)main_malloc(SNPRINTF_BUFSIZE)) == NULL)
         {
           return ENOMEM;
         }
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index cd1d7b5..6c03d3e 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -78,7 +78,7 @@ xd3_realloc_buffer (xd3_stream *stream,
   cur_size = current_units * unit_size;
   new_alloc = xd3_round_blksize (needed * 2, XD3_ALLOCSIZE);
 
-  if ((new_buf = xd3_alloc (stream, new_alloc, 1)) == NULL)
+  if ((new_buf = (uint8_t*) xd3_alloc (stream, new_alloc, 1)) == NULL)
     {
       return ENOMEM;
     }
@@ -475,7 +475,7 @@ int xd3_merge_inputs (xd3_stream *stream,
                       xd3_whole_state *input)
 {
   int ret = 0;
-  int input_i;
+  size_t input_i;
 
   /* iterate over each instruction. */
   for (input_i = 0; ret == 0 && input_i < input->instlen; ++input_i)