From b36f8a4d350735006293e01ab87208b579e67bf6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 19 Feb 2017 18:32:51 +0200 Subject: [PATCH] Avoid aborts during loadup * src/emacs-module.c (syms_of_module): * src/image.c (xpm_make_color_table_h): Update calls to make_hash_table to adjust to a recent change in fns.c. * src/fns.c (make_hash_table): * src/lisp.h (make_hash_table): 4th arg is now of type double. --- src/emacs-module.c | 4 ++-- src/fns.c | 2 +- src/image.c | 4 ++-- src/lisp.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/emacs-module.c b/src/emacs-module.c index 69fa5c8e64c..5a66b516513 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -1015,8 +1015,8 @@ syms_of_module (void) Vmodule_refs_hash = make_hash_table (hashtest_eq, make_number (DEFAULT_HASH_SIZE), make_float (DEFAULT_REHASH_SIZE), - make_float (DEFAULT_REHASH_THRESHOLD), - Qnil, Qnil); + DEFAULT_REHASH_THRESHOLD, + Qnil, false); Funintern (Qmodule_refs_hash, Qnil); DEFSYM (Qmodule_environments, "module-environments"); diff --git a/src/fns.c b/src/fns.c index e3e040b82d4..ccb5230f5cb 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3676,7 +3676,7 @@ allocate_hash_table (void) Lisp_Object make_hash_table (struct hash_table_test test, Lisp_Object size, Lisp_Object rehash_size, - float rehash_threshold, Lisp_Object weak, + double rehash_threshold, Lisp_Object weak, bool pure) { struct Lisp_Hash_Table *h; diff --git a/src/image.c b/src/image.c index 1e8ebfd40d5..0a6bbd17d88 100644 --- a/src/image.c +++ b/src/image.c @@ -4019,8 +4019,8 @@ xpm_make_color_table_h (void (**put_func) (Lisp_Object, const char *, int, *get_func = xpm_get_color_table_h; return make_hash_table (hashtest_equal, make_number (DEFAULT_HASH_SIZE), make_float (DEFAULT_REHASH_SIZE), - make_float (DEFAULT_REHASH_THRESHOLD), - Qnil, Qnil); + DEFAULT_REHASH_THRESHOLD, + Qnil, false); } static void diff --git a/src/lisp.h b/src/lisp.h index 985d54a0795..d8030728a5a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3363,7 +3363,7 @@ EMACS_UINT hash_string (char const *, ptrdiff_t); EMACS_UINT sxhash (Lisp_Object, int); Lisp_Object make_hash_table (struct hash_table_test test, Lisp_Object size, Lisp_Object rehash_size, - float rehash_threshold, Lisp_Object weak, + double rehash_threshold, Lisp_Object weak, bool pure); ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, -- 2.39.5