Fix WINDOWSNT build of fileio.c and image.c

* src/fileio.c (emacs_fd_to_int): Don't define on WINDOWSNT.
* src/image.c (image_create_bitmap_from_data): Don't abort if
!defined HAVE_ANDROID.

diff --git a/src/fileio.c b/src/fileio.c
index 5153aeae24897bf7995f8488d78d8952f081fd41..1e54f58387605c86601d2b12ef0e60e074ac5888 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -128,7 +128,12 @@ typedef int emacs_fd;
 #define emacs_fd_lseek         lseek
 #define emacs_fd_fstat         sys_fstat
 #define emacs_fd_valid_p(fd)   ((fd) >= 0)
+
+/* This is not used on MS Windows.  */
+
+#ifndef WINDOWSNT
 #define emacs_fd_to_int(fds)   (fds)
+#endif /* WINDOWSNT */
 
 #else /* HAVE_ANDROID && !defined ANDROID_STUBIFY */
 

diff --git a/src/image.c b/src/image.c
index dc45a2d2419959d7c6a8cf75d339bcb005f8b437..dc66b1056dbcedeebc0cabdede524cec5853b6f3 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -517,10 +517,10 @@ image_create_bitmap_from_data (struct frame *f, char *bits,
 
   if (!bitmap)
     return -1;
-#else
+#elif defined HAVE_ANDROID
   ((void) dpyinfo);
   emacs_abort ();
-#endif
+#endif /* HAVE_ANDROID && !defined ANDROID_STUBIFY */
 
 #ifdef HAVE_NTGUI
   Lisp_Object frame UNINIT;    /* The value is not used.  */