From: Po Lu <luangruo@yahoo.com>
Date: Sat, 21 Dec 2024 00:53:21 +0000 (+0800)
Subject: Fix a number of Android compilation warnings
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a6913c1c7f4d16f36513e65044515ecc78e57ff;p=emacs.git

Fix a number of Android compilation warnings

* src/dispnew.c (frame_rect_abs, frame_pos_abs, rect_intersect)
(copy_child_glyphs, abs_cursor_pos, is_in_matrix)
(is_cursor_obscured) [HAVE_ANDROID]: Delete functions.

(cherry picked from commit 2d173aa3d34e60206f4889eb0220aa2269b3ed4d)
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 0137f66fbca..1f6a578f880 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3285,6 +3285,8 @@ struct rect
   int x, y, w, h;
 };
 
+#ifndef HAVE_ANDROID
+
 /* Compute the intersection of R1 and R2 in R.  Value is true if R1 and
    R2 intersect, false otherwise.  */
 
@@ -3327,6 +3329,8 @@ frame_rect_abs (struct frame *f)
   return (struct rect) { x, y, f->total_cols, f->total_lines };
 }
 
+#endif /* !HAVE_ANDROID */
+
 /* Return the root frame of frame F.  Follow the parent_frame chain
    until we reach a frame that has no parent.  That is the root frame.
    Note that the root of a root frame is itself. */
@@ -3509,6 +3513,8 @@ make_matrix_current (struct frame *f)
 	make_current (f, NULL, i);
 }
 
+#ifndef HAVE_ANDROID
+
 /* Prepare ROOT's desired row at index Y for copying child frame
    contents to it.  Value is the prepared desired row or NULL if we
    don't have, and can't contruct a desired row.  */
@@ -3742,6 +3748,8 @@ copy_child_glyphs (struct frame *root, struct frame *child)
     }
 }
 
+#endif /* !HAVE_ANDROID */
+
 /***********************************************************************
 			     Frame Update
  ***********************************************************************/
@@ -3834,6 +3842,8 @@ update_tty_frame (struct frame *f)
   build_frame_matrix (f);
 }
 
+#ifndef HAVE_ANDROID
+
 /* Return the cursor position of the selected window of frame F, in
    absolute coordinates in *X and *Y.  Note that if F is a child frame,
    its cursor may be clipped, i.e. outside of the bounds of the terminal
@@ -3900,8 +3910,6 @@ is_cursor_obscured (void)
   return cursor_glyph->frame != SELECTED_FRAME ();
 }
 
-#ifndef HAVE_ANDROID
-
 /* Decide where to show the cursor, and whether to hide it.
 
    This works very well for Vertico-Posframe, Transient-Posframe and