# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 974118255 0
# Node ID 2c60aa5cd386bb279c8a1f4250823cad8ede59f1
# Parent  ec5c714ae981e45ca7de464403c7b55118f3e10e
(x_create_bitmap_from_file, x_find_image_file): Use new openp return protocol.

diff -r ec5c714ae981 -r 2c60aa5cd386 src/w32fns.c
--- a/src/w32fns.c	Mon Nov 13 12:18:37 2000 +0000
+++ b/src/w32fns.c	Mon Nov 13 12:24:15 2000 +0000
@@ -584,9 +584,6 @@
   fd = openp (Vx_bitmap_file_path, file, "", &found, 0);
   if (fd < 0)
     return -1;
-  /* LoadLibraryEx won't handle special files handled by Emacs handler.  */
-  if (fd == 0)
-    return -1;
   emacs_close (fd);
 
   filename = (char *) XSTRING (found)->data;
@@ -8377,7 +8374,7 @@
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
   fd = openp (search_path, file, "", &file_found, 0);
   
-  if (fd < 0)
+  if (fd == -1)
     file_found = Qnil;
   else
     close (fd);
diff -r ec5c714ae981 -r 2c60aa5cd386 src/xfns.c
--- a/src/xfns.c	Mon Nov 13 12:18:37 2000 +0000
+++ b/src/xfns.c	Mon Nov 13 12:24:15 2000 +0000
@@ -663,9 +663,6 @@
   fd = openp (Vx_bitmap_file_path, file, "", &found, 0);
   if (fd < 0)
     return -1;
-  /* XReadBitmapFile won't handle magic file names.  */
-  if (fd == 0)
-    return -1;
   emacs_close (fd);
 
   filename = (char *) XSTRING (found)->data;
@@ -6110,7 +6107,7 @@
   /* Try to find FILE in data-directory, then x-bitmap-file-path.  */
   fd = openp (search_path, file, "", &file_found, 0);
   
-  if (fd < 0)
+  if (fd == -1)
     file_found = Qnil;
   else
     close (fd);