From: Po Lu <luangruo@yahoo.com>
Date: Thu, 27 Apr 2023 11:23:29 +0000 (+0800)
Subject: Update Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab10d1f6634f1d09e447427c442eb206ce6afc0b;p=emacs.git

Update Android port

* src/image.c (image_create_bitmap_from_data): Fix typo in
preprocessor conditionals.
---

diff --git a/src/image.c b/src/image.c
index dc66b1056db..75168291708 100644
--- a/src/image.c
+++ b/src/image.c
@@ -634,8 +634,10 @@ image_create_bitmap_from_data (struct frame *f, char *bits,
   dpyinfo->bitmaps[id - 1].width = width;
   dpyinfo->bitmaps[id - 1].refcount = 1;
 
-#if defined HAVE_X_WINDOWS && defined HAVE_ANDROID
+#if defined HAVE_X_WINDOWS || defined HAVE_ANDROID
+#ifndef ANDROID_STUBIFY
   dpyinfo->bitmaps[id - 1].pixmap = bitmap;
+#endif /* ANDROID_STUBIFY */
   dpyinfo->bitmaps[id - 1].have_mask = false;
   dpyinfo->bitmaps[id - 1].depth = 1;
 #ifdef USE_CAIRO