Mercurial > hg > xemacs-beta
comparison src/device-msw.c @ 5192:635f4b506855
Call internal_hash() with its new arg, Win32-specific code, fixing build
src/ChangeLog addition:
2010-04-06 Aidan Kehoe <kehoea@parhasard.net>
* toolbar-msw.c (allocate_toolbar_item_id)
(mswindows_output_toolbar):
* menubar-msw.c (allocate_menu_item_id, checksum_menu_item):
* glyphs-msw.c (mswindows_image_instance_hash):
* fontcolor-msw.c (mswindows_color_instance_equal):
* device-msw.c (hash_devmode):
Call internal_hash() with the correct number of arguments, declare
various hash methods with the correct number of arguments, fixing
the Win32 build. Thank you Vin.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 06 Apr 2010 15:08:22 +0100 |
| parents | 97eb4942aec8 |
| children | 8608eadee6ba 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
| 5191:71ee43b8a74d | 5192:635f4b506855 |
|---|---|
| 1183 return 1; | 1183 return 1; |
| 1184 return lisp_strcasecmp_i18n (dm1->printer_name, dm2->printer_name) == 0; | 1184 return lisp_strcasecmp_i18n (dm1->printer_name, dm2->printer_name) == 0; |
| 1185 } | 1185 } |
| 1186 | 1186 |
| 1187 static Hashcode | 1187 static Hashcode |
| 1188 hash_devmode (Lisp_Object obj, int depth) | 1188 hash_devmode (Lisp_Object obj, int depth, Boolint UNUSED (equalp)) |
| 1189 { | 1189 { |
| 1190 Lisp_Devmode *dm = XDEVMODE (obj); | 1190 Lisp_Devmode *dm = XDEVMODE (obj); |
| 1191 | 1191 |
| 1192 return HASH3 (XDEVMODE_SIZE (dm), | 1192 return HASH3 (XDEVMODE_SIZE (dm), |
| 1193 dm->devmode ? memory_hash (dm->devmode, XDEVMODE_SIZE (dm)) | 1193 dm->devmode ? memory_hash (dm->devmode, XDEVMODE_SIZE (dm)) |
| 1194 : 0, | 1194 : 0, |
| 1195 internal_hash (dm->printer_name, depth + 1)); | 1195 internal_hash (dm->printer_name, depth + 1, 0)); |
| 1196 } | 1196 } |
| 1197 | 1197 |
| 1198 DEFINE_NODUMP_LISP_OBJECT ("msprinter-settings", devmode, | 1198 DEFINE_NODUMP_LISP_OBJECT ("msprinter-settings", devmode, |
| 1199 mark_devmode, print_devmode, | 1199 mark_devmode, print_devmode, |
| 1200 finalize_devmode, | 1200 finalize_devmode, |