@@ -904,18 +904,18 @@ int pdf_extract_obj(struct pdf_struct *pdf, struct pdf_obj *obj, uint32_t flags)

                     if (length < 0)

                         length = 0;

-                    cli_dbgmsg("cli_pdf: calculated length %ld\n", length);

+                    cli_dbgmsg("cli_pdf: calculated length %jd\n", (intmax_t)length);

                 } else {

                     if (size > (size_t)length+2) {

-                        cli_dbgmsg("cli_pdf: calculated length %llu < %llu\n",

-                                   (long long unsigned)length, (long long unsigned)size);

+                        cli_dbgmsg("cli_pdf: calculated length %jd < %jd\n",

+                                   (intmax_t)length, (intmax_t)size);

                         length = size;

                     }

                 }

                 if (orig_length && size > (size_t)orig_length + 20) {

-                    cli_dbgmsg("cli_pdf: orig length: %ld, length: %ld, size: %llu\n", orig_length, length,

-                               (long long unsigned)size);

+                    cli_dbgmsg("cli_pdf: orig length: %jd, length: %jd, size: %jd\n",

+                               (intmax_t)orig_length, (intmax_t)length, (intmax_t)size);

                     pdfobj_flag(pdf, obj, BAD_STREAMLEN);

                 }

@@ -1052,7 +1052,7 @@ int pdf_extract_obj(struct pdf_struct *pdf, struct pdf_obj *obj, uint32_t flags)

         }

     } while (0);

-    cli_dbgmsg("cli_pdf: extracted %ld bytes %u %u obj\n", sum, obj->id>>8, obj->id&0xff);

+    cli_dbgmsg("cli_pdf: extracted %jd bytes %u %u obj\n", (intmax_t)sum, obj->id>>8, obj->id&0xff);

     cli_dbgmsg("         ... to %s\n", fullname);

     if (flags & PDF_EXTRACT_OBJ_SCAN && sum) {

@@ -2317,7 +2317,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)

     if (pdfver != start || offset) {

         pdf.flags |= 1 << BAD_PDF_HEADERPOS;

-        cli_dbgmsg("cli_pdf: PDF header is not at position 0: %ld\n",pdfver-start+offset);

+        cli_dbgmsg("cli_pdf: PDF header is not at position 0: %jd\n",(intmax_t)(pdfver-start+offset));

 #if HAVE_JSON

         if (pdfobj)

             cli_jsonbool(pdfobj, "BadVersionLocation", 1);

@@ -2426,7 +2426,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)

     while ((rc = pdf_findobj(&pdf)) > 0) {

         struct pdf_obj *obj = &pdf.objs[pdf.nobjs-1];

-        cli_dbgmsg("cli_pdf: found %d %d obj @%ld\n", obj->id >> 8, obj->id&0xff, obj->start + offset);

+        cli_dbgmsg("cli_pdf: found %d %d obj @%jd\n", obj->id >> 8, obj->id&0xff, (intmax_t)(obj->start + offset));

     }

     if (pdf.nobjs)