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 94921dc9ea19f889c7b580c0399fb7b66016bceb..6c581bcd0bc52e76712c1d5fc217176b2fd9a374 100644 (file)
--- 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));