From: Miles Bader <miles@gnu.org>
Date: Mon, 13 Nov 2000 12:24:15 +0000 (+0000)
Subject: (x_create_bitmap_from_file, x_find_image_file): Use new openp return protocol.
X-Git-Tag: emacs-pretest-21.0.90~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=939d6465fc54ccd74381dae6bba1dd416928e8b8;p=emacs.git

(x_create_bitmap_from_file, x_find_image_file): Use new openp return protocol.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index a0bd2b67451..4ff6065ef60 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -584,9 +584,6 @@ x_create_bitmap_from_file (f, file)
   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 @@ x_find_image_file (file)
   /* 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 --git a/src/xfns.c b/src/xfns.c
index 2b5ff4cc9fa..1a45b20c984 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -663,9 +663,6 @@ x_create_bitmap_from_file (f, file)
   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 @@ x_find_image_file (file)
   /* 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);