Merge from savannah/emacs-30

976416bebe2 Fix some function type declaration
23549d71751 * src/image.c (gui_put_x_image): Avoid memory leak.
cb633820c15 ; * doc/misc/use-package.texi (Getting Started): Fix word...

1 files changed, 2 insertions, 7 deletions

diff --git a/src/image.c b/src/image.c
index 9d97337fd31..1b26af05351 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4177,7 +4177,7 @@ static void
 gui_put_x_image (struct frame *f, Emacs_Pix_Container pimg,
                  Emacs_Pixmap pixmap, int width, int height)
 {
-#if defined USE_CAIRO || defined HAVE_HAIKU
+#if defined USE_CAIRO || defined HAVE_HAIKU || defined HAVE_NS
   eassert (pimg == pixmap);
 #elif defined HAVE_X_WINDOWS
   GC gc;
@@ -4189,12 +4189,7 @@ gui_put_x_image (struct frame *f, Emacs_Pix_Container pimg,
   XFreeGC (FRAME_X_DISPLAY (f), gc);
 #elif defined HAVE_ANDROID
   android_put_image (pixmap, pimg);
-#endif
-
-#ifdef HAVE_NS
-  eassert (pimg == pixmap);
-  ns_retain_object (pimg);
-#endif
+#endif /* HAVE_ANDROID */
 }
 
 /* Thin wrapper for image_create_x_image_and_pixmap_1, so that it matches