diff options
| author | Eli Zaretskii | 2017-02-19 18:32:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2017-02-19 18:32:51 +0200 |
| commit | b36f8a4d350735006293e01ab87208b579e67bf6 (patch) | |
| tree | ae6bea869178c704d7da16b25bb40f93181dfc1b /src/lisp.h | |
| parent | 143bc75c414434badcb324db056ad37c15893bd9 (diff) | |
| download | emacs-b36f8a4d350735006293e01ab87208b579e67bf6.tar.gz emacs-b36f8a4d350735006293e01ab87208b579e67bf6.zip | |
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.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); | |||
| 3363 | EMACS_UINT sxhash (Lisp_Object, int); | 3363 | EMACS_UINT sxhash (Lisp_Object, int); |
| 3364 | Lisp_Object make_hash_table (struct hash_table_test test, | 3364 | Lisp_Object make_hash_table (struct hash_table_test test, |
| 3365 | Lisp_Object size, Lisp_Object rehash_size, | 3365 | Lisp_Object size, Lisp_Object rehash_size, |
| 3366 | float rehash_threshold, Lisp_Object weak, | 3366 | double rehash_threshold, Lisp_Object weak, |
| 3367 | bool pure); | 3367 | bool pure); |
| 3368 | ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); | 3368 | ptrdiff_t hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, EMACS_UINT *); |
| 3369 | ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, | 3369 | ptrdiff_t hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, |