diff options
| author | YAMAMOTO Mitsuharu | 2006-10-31 08:33:53 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2006-10-31 08:33:53 +0000 |
| commit | 6ceb8058570a0be21df9bde80d2ee269bdf7291a (patch) | |
| tree | 946c43622141b33b8fcda07e23279b63cce4c3df | |
| parent | 369a7a37d8c0f803b515f7bc96f462f60d19fb22 (diff) | |
| download | emacs-6ceb8058570a0be21df9bde80d2ee269bdf7291a.tar.gz emacs-6ceb8058570a0be21df9bde80d2ee269bdf7291a.zip | |
(create_apple_event_from_event_ref)
(create_apple_event_from_drag_ref, xrm_merge_string_database)
(xrm_get_resource, xrm_get_preference_database): Add const
qualifier to arguments in externs.
| -rw-r--r-- | src/ChangeLog | 55 | ||||
| -rw-r--r-- | src/macterm.h | 13 |
2 files changed, 62 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c91555cf415..069a0231001 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,58 @@ | |||
| 1 | 2006-10-31 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * image.c [MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v) | ||
| 4 | (xpm_put_color_table_v, xpm_get_color_table_v, xpm_make_color_table_h) | ||
| 5 | (xpm_put_color_table_h, xpm_get_color_table_h, xpm_str_to_color_key) | ||
| 6 | (xpm_load_image): Add const qualifier to arguments. | ||
| 7 | [MAC_OS] (xpm_color_key_strings): Make static const. | ||
| 8 | |||
| 9 | * mac.c (create_apple_event_from_event_ref) | ||
| 10 | (create_apple_event_from_drag_ref, skip_white_space, parse_comment) | ||
| 11 | (parse_include_file, parse_binding, parse_component) | ||
| 12 | (parse_resource_name, parse_value, parse_resource_line) | ||
| 13 | (xrm_merge_string_database, xrm_get_resource) | ||
| 14 | (xrm_get_preference_database): Add const qualifier to arguments. | ||
| 15 | [MAC_OSX] (sys_select): Make variable `context' static const. | ||
| 16 | |||
| 17 | * macfns.c (mac_color_map): Make static const. | ||
| 18 | (mac_color_map_lookup): Add const qualifier to arguments. | ||
| 19 | |||
| 20 | * macmenu.c (install_menu_quit_handler): Make variable `typesList' | ||
| 21 | static const. | ||
| 22 | (name_is_separator): Add const qualifier to arguments. | ||
| 23 | |||
| 24 | * macselect.c (init_service_handler): Make variable `specs' static | ||
| 25 | const. | ||
| 26 | |||
| 27 | * macterm.c (mac_create_bitmap_from_bitmap_data): Make variable | ||
| 28 | `swap_nibbles' static const. | ||
| 29 | (atsu_get_text_layout_with_text_ptr): Make variables `lengths', | ||
| 30 | `tags', `sizes', `values' static const. | ||
| 31 | (mac_draw_string_common): Make variables `context' static. Make | ||
| 32 | variables `tags', `sizes', and `values' static const. | ||
| 33 | (pcm_get_status, x_detect_focus_change, x_scroll_bar_handle_click) | ||
| 34 | (xlfdpat_create, xlfdpat_block_match_1, xlfdpat_match) | ||
| 35 | (mac_to_x_fontname, parse_x_font_name, add_mac_font_name) | ||
| 36 | (mac_do_list_fonts, is_fully_specified_xlfd, do_grow_window) | ||
| 37 | (mac_store_event_ref_as_apple_event, mac_make_rdb): Add const | ||
| 38 | qualifier to arguments. | ||
| 39 | (xlfd_scalable_fields, keycode_to_xkeysym_table) | ||
| 40 | (fn_keycode_to_keycode_table): Make static const. | ||
| 41 | (mac_load_query_font): Make variables `tags', `sizes', `values', | ||
| 42 | `types', and `selectors' static const. | ||
| 43 | (mac_handle_command_event, mac_handle_window_event): Make | ||
| 44 | variables `names' and `types' static const. | ||
| 45 | (init_command_handler, install_window_handler): Make variables | ||
| 46 | `specs*' static const. | ||
| 47 | (mac_handle_font_event, mac_handle_text_input_event) | ||
| 48 | (mac_store_service_event): Make variables `names' and `types' | ||
| 49 | const. Make variables `names_*' and `types_*' static const. | ||
| 50 | |||
| 51 | * macterm.h (create_apple_event_from_event_ref) | ||
| 52 | (create_apple_event_from_drag_ref, xrm_merge_string_database) | ||
| 53 | (xrm_get_resource, xrm_get_preference_database): Add const | ||
| 54 | qualifier to arguments in externs. | ||
| 55 | |||
| 1 | 2006-10-31 Kenichi Handa <handa@m17n.org> | 56 | 2006-10-31 Kenichi Handa <handa@m17n.org> |
| 2 | 57 | ||
| 3 | * xfns.c (xic_create_xfontset): Fix previous change. | 58 | * xfns.c (xic_create_xfontset): Fix previous change. |
diff --git a/src/macterm.h b/src/macterm.h index edd89163e13..cac90f1fa80 100644 --- a/src/macterm.h +++ b/src/macterm.h | |||
| @@ -669,11 +669,11 @@ extern Lisp_Object mac_aedesc_to_lisp P_ ((const AEDesc *)); | |||
| 669 | extern OSErr mac_ae_put_lisp P_ ((AEDescList *, UInt32, Lisp_Object)); | 669 | extern OSErr mac_ae_put_lisp P_ ((AEDescList *, UInt32, Lisp_Object)); |
| 670 | #if TARGET_API_MAC_CARBON | 670 | #if TARGET_API_MAC_CARBON |
| 671 | extern OSStatus create_apple_event_from_event_ref P_ ((EventRef, UInt32, | 671 | extern OSStatus create_apple_event_from_event_ref P_ ((EventRef, UInt32, |
| 672 | EventParamName *, | 672 | const EventParamName *, |
| 673 | EventParamType *, | 673 | const EventParamType *, |
| 674 | AppleEvent *)); | 674 | AppleEvent *)); |
| 675 | extern OSErr create_apple_event_from_drag_ref P_ ((DragRef, UInt32, | 675 | extern OSErr create_apple_event_from_drag_ref P_ ((DragRef, UInt32, |
| 676 | FlavorType *, | 676 | const FlavorType *, |
| 677 | AppleEvent *)); | 677 | AppleEvent *)); |
| 678 | extern CFStringRef cfstring_create_with_utf8_cstring P_ ((const char *)); | 678 | extern CFStringRef cfstring_create_with_utf8_cstring P_ ((const char *)); |
| 679 | extern CFStringRef cfstring_create_with_string P_ ((Lisp_Object)); | 679 | extern CFStringRef cfstring_create_with_string P_ ((Lisp_Object)); |
| @@ -686,9 +686,10 @@ extern Lisp_Object cfboolean_to_lisp P_ ((CFBooleanRef)); | |||
| 686 | extern Lisp_Object cfobject_desc_to_lisp P_ ((CFTypeRef)); | 686 | extern Lisp_Object cfobject_desc_to_lisp P_ ((CFTypeRef)); |
| 687 | extern Lisp_Object cfproperty_list_to_lisp P_ ((CFPropertyListRef, int, int)); | 687 | extern Lisp_Object cfproperty_list_to_lisp P_ ((CFPropertyListRef, int, int)); |
| 688 | #endif | 688 | #endif |
| 689 | extern void xrm_merge_string_database P_ ((XrmDatabase, char *)); | 689 | extern void xrm_merge_string_database P_ ((XrmDatabase, const char *)); |
| 690 | extern Lisp_Object xrm_get_resource P_ ((XrmDatabase, char *, char *)); | 690 | extern Lisp_Object xrm_get_resource P_ ((XrmDatabase, const char *, |
| 691 | extern XrmDatabase xrm_get_preference_database P_ ((char *)); | 691 | const char *)); |
| 692 | extern XrmDatabase xrm_get_preference_database P_ ((const char *)); | ||
| 692 | EXFUN (Fmac_get_preference, 4); | 693 | EXFUN (Fmac_get_preference, 4); |
| 693 | 694 | ||
| 694 | /* arch-tag: 6b4ca125-5bef-476d-8ee8-31ed808b7e79 | 695 | /* arch-tag: 6b4ca125-5bef-476d-8ee8-31ed808b7e79 |