diff options
| author | Jan Djärv | 2012-11-08 20:52:28 +0100 |
|---|---|---|
| committer | Jan Djärv | 2012-11-08 20:52:28 +0100 |
| commit | a23c4171a74f79674172683b9b227e036109cf54 (patch) | |
| tree | 51e456787be628ad8f229a328467a7c3b1dd1957 /src | |
| parent | 074d7bb094256a445101a851fb4cd94aeca4574b (diff) | |
| download | emacs-a23c4171a74f79674172683b9b227e036109cf54.tar.gz emacs-a23c4171a74f79674172683b9b227e036109cf54.zip | |
* image.c (xpm_make_color_table_h): Fix compiler error because
make_hash_table changed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a2f39db5a88..a90dfd97ec3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-11-08 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * image.c (xpm_make_color_table_h): Fix compiler error because | ||
| 4 | make_hash_table changed. | ||
| 5 | |||
| 1 | 2012-11-08 Thomas Kappler <tkappler@gmail.com> (tiny change) | 6 | 2012-11-08 Thomas Kappler <tkappler@gmail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541). | 8 | * nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541). |
diff --git a/src/image.c b/src/image.c index 538ae2b7772..45c38fd9890 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3731,10 +3731,10 @@ xpm_make_color_table_h (void (**put_func) (Lisp_Object, | |||
| 3731 | { | 3731 | { |
| 3732 | *put_func = xpm_put_color_table_h; | 3732 | *put_func = xpm_put_color_table_h; |
| 3733 | *get_func = xpm_get_color_table_h; | 3733 | *get_func = xpm_get_color_table_h; |
| 3734 | return make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE), | 3734 | return make_hash_table (hashtest_eql, make_number (DEFAULT_HASH_SIZE), |
| 3735 | make_float (DEFAULT_REHASH_SIZE), | 3735 | make_float (DEFAULT_REHASH_SIZE), |
| 3736 | make_float (DEFAULT_REHASH_THRESHOLD), | 3736 | make_float (DEFAULT_REHASH_THRESHOLD), |
| 3737 | Qnil, Qnil, Qnil); | 3737 | Qnil); |
| 3738 | } | 3738 | } |
| 3739 | 3739 | ||
| 3740 | static void | 3740 | static void |