Merge remote-tracking branch 'upstream/master' into vlm_master

asn1-tools/unber/libasn1_unber_tool.c

@@ -207,8 +207,8 @@ process_deeper(const char *fname, input_stream_t *ibs, output_stream_t *os,
         case -1:
             osprintfError(os,
                           "%s: Fatal error decoding value length"
-                          " at %zu\n",
-                          fname, (size_t)ibs->bytesRead(ibs));
+                          " at %lld\n",
+                          fname, (long long)ibs->bytesRead(ibs));
             return PD_FAILED;
         case 0:
             /* More data expected */
@@ -219,8 +219,8 @@ process_deeper(const char *fname, input_stream_t *ibs, output_stream_t *os,
         if((t_len + l_len) != tblen) {
             osprintfError(os,
                           "%s: Outer tag length doesn't match inner tag length"
-                          " at %zu\n",
-                          fname, (size_t)ibs->bytesRead(ibs));
+                          " at %lld\n",
+                          fname, (long long)ibs->bytesRead(ibs));
             return PD_FAILED;
         }
 

libasn1common/asn1_common.h

-/*-
+/*
  * Copyright (c) 2005 Lev Walkin <vlm@lionet.info>. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -31,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <assert.h>
 #include <errno.h>