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/image.c | |
| 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/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
| 4019 | *get_func = xpm_get_color_table_h; | 4019 | *get_func = xpm_get_color_table_h; |
| 4020 | return make_hash_table (hashtest_equal, make_number (DEFAULT_HASH_SIZE), | 4020 | return make_hash_table (hashtest_equal, make_number (DEFAULT_HASH_SIZE), |
| 4021 | make_float (DEFAULT_REHASH_SIZE), | 4021 | make_float (DEFAULT_REHASH_SIZE), |
| 4022 | make_float (DEFAULT_REHASH_THRESHOLD), | 4022 | DEFAULT_REHASH_THRESHOLD, |
| 4023 | Qnil, Qnil); | 4023 | Qnil, false); |
| 4024 | } | 4024 | } |
| 4025 | 4025 | ||
| 4026 | static void | 4026 | static void |