emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master b5b7f6e: Fix MinGW build broken by recent pdumper changes.


From: Eli Zaretskii
Subject: master b5b7f6e: Fix MinGW build broken by recent pdumper changes.
Date: Tue, 11 Aug 2020 13:00:10 -0400 (EDT)

branch: master
commit b5b7f6eb88d6588f6150c34e1405457f062538bb
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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.
---
 src/pdumper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pdumper.c b/src/pdumper.c
index 94921dc..6c581bc 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));
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]