From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 11 Aug 2020 16:59:17 +0000 (+0300)
Subject: Fix MinGW build broken by recent pdumper changes.
X-Git-Tag: emacs-28.0.90~6685
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5b7f6eb88d6588f6150c34e1405457f062538bb;p=emacs.git

Fix MinGW build broken by recent pdumper changes.

* src/pdumper.c (hash_table_thaw): Use Fmake_vector.  Suggested by
Pip Cet <pipcet@gmail.com>.
(dump_trace): Declare ATTRIBUTE_FORMAT_PRINTF, not
ATTRIBUTE_FORMAT((__printf__), so that we pick the right attribute
for MinGW.
---

diff --git a/src/pdumper.c b/src/pdumper.c
index 94921dc9ea1..6c581bcd0bc 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -145,7 +145,7 @@ typedef int_least32_t dump_off;
 
 enum { EMACS_INT_XDIGITS = (EMACS_INT_WIDTH + 3) / 4 };
 
-static void ATTRIBUTE_FORMAT ((printf, 1, 2))
+static void ATTRIBUTE_FORMAT_PRINTF (1, 2)
 dump_trace (const char *fmt, ...)
 {
   if (0)
@@ -2664,7 +2664,7 @@ static void
 hash_table_thaw (Lisp_Object hash)
 {
   struct Lisp_Hash_Table *h = XHASH_TABLE (hash);
-  h->hash = make_nil_vector (XFIXNUM (h->hash));
+  h->hash = Fmake_vector (h->hash, Qnil);
   h->next = Fmake_vector (h->next, make_fixnum (-1));
   h->index = Fmake_vector (h->index, make_fixnum (-1));