(x_y_to_hpos_vpos, fast_find_position) [HAVE_CARBON]:

Make functions non-static.

diff --git a/src/ChangeLog b/src/ChangeLog
index aaa49be..456d03c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2008-04-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macterm.c (Vmac_ts_active_input_buf) [USE_MAC_TSM]: New variable.
+       (syms_of_macterm) [USE_MAC_TSM]: Defvar it.
+       (Qmouse_drag_overlay) [MAC_OSX]: New variable.
+       (syms_of_macterm) [MAC_OSX]: Intern and staticpro it.
+       (mac_get_selected_range, mac_store_buffer_text_to_unicode_chars)
+       (mac_ax_selected_text_range) [MAC_OSX]: New functions.
+       (mac_ax_number_of_characters) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+       Likewise.
+
+       * mactoolbox.c (Vmac_ts_active_input_buf) [USE_MAC_TSM]: Add extern.
+       (fast_find_position, x_y_to_hpos_vpos, mac_ax_selected_text_range):
+       (mac_ax_number_of_characters): Add externs.
+       (mac_get_selected_range, mac_store_buffer_text_to_unicode_chars)
+       [USE_MAC_TSM]: Likewise.
+       (mac_handle_text_input_event) [MAC_OSX]:
+       Handle kEventTextInputOffsetToPos for no active input area case.
+       Handle kEventTextInputPosToOffset and kEventTextInputGetSelectedText.
+       (mac_handle_document_access_event)
+       [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: New function.
+       (install_application_handler) [MAC_OSX]: Register handlers for
+       kEventTextInputPosToOffset and kEventTextInputGetSelectedText.
+       (install_application_handler) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+       Register mac_handle_document_access_event.
+
+       * xdisp.c (x_y_to_hpos_vpos, fast_find_position) [HAVE_CARBON]:
+       Make functions non-static.
+
 2008-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * mac.c (create_apple_event) [TARGET_API_MAC_CARBON]:

diff --git a/src/xdisp.c b/src/xdisp.c
index f20aaed..897dd44 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1700,7 +1700,10 @@ glyph_to_pixel_coords (w, hpos, vpos, frame_x, frame_y)
    text, or we can't tell because W's current matrix is not up to
    date.  */
 
-static struct glyph *
+#ifndef HAVE_CARBON
+static
+#endif
+struct glyph *
 x_y_to_hpos_vpos (w, x, y, hpos, vpos, dx, dy, area)
      struct window *w;
      int x, y;
@@ -22079,7 +22082,10 @@ cursor_in_mouse_face_p (w)
         in 20.x as well, and I think it's too risky to install
         so near the release of 21.1.  2001-09-25 gerd.  */
 
-static int
+#ifndef HAVE_CARBON
+static
+#endif
+int
 fast_find_position (w, charpos, hpos, vpos, x, y, stop)
      struct window *w;
      int charpos;