x_find_image_file

x_find_image_file

[Masatake YAMATO]

With --with-gtk, make claims that it cannot find x_find_image_file.
I've removed static modifiers but I'm not sure this is true fix or not.

Masatake YAMATO
Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.607
diff -u -r1.607 xfns.c
--- src/xfns.c	11 Mar 2004 00:25:38 -0000	1.607
+++ src/xfns.c	12 Mar 2004 05:08:24 -0000
@@ -761,7 +761,7 @@
 
 #ifdef USE_GTK
 
-static Lisp_Object x_find_image_file P_ ((Lisp_Object file));
+extern Lisp_Object x_find_image_file P_ ((Lisp_Object file));
 
 /* Set icon from FILE for frame F.  By using GTK functions the icon
    may be any format that GdkPixbuf knows about, i.e. not just bitmaps.  */
Index: src/image.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/image.c,v
retrieving revision 1.4
diff -u -r1.4 image.c
--- src/image.c	11 Mar 2004 22:43:06 -0000	1.4
+++ src/image.c	12 Mar 2004 05:08:24 -0000
@@ -1998,7 +1998,7 @@
 			      File Handling
  ***********************************************************************/
 
-static Lisp_Object x_find_image_file P_ ((Lisp_Object));
+Lisp_Object x_find_image_file P_ ((Lisp_Object));
 static unsigned char *slurp_file P_ ((char *, int *));
 
 
@@ -2006,7 +2006,7 @@
    x-bitmap-file-path.  Value is the full name of the file found, or
    nil if not found.  */
 
-static Lisp_Object
+Lisp_Object
 x_find_image_file (file)
      Lisp_Object file;
 {
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.3580
diff -u -r1.3580 ChangeLog
--- src/ChangeLog	11 Mar 2004 22:48:33 -0000	1.3580
+++ src/ChangeLog	12 Mar 2004 05:08:26 -0000
@@ -1,3 +1,9 @@
+2004-03-12  Masatake YAMATO  <jet@gyve.org>
+
+	* xfns.c(x_find_image_file): Add extern.
+
+	* image.c(x_find_image_file): Make it global.
+
 2004-03-12  Kim F. Storm  <storm@cua.dk>
 
 	Fix image support on MAC.  From YAMAMOTO Mitsuharu.

Re: x_find_image_file

[Kim F. Storm]

Masatake YAMATO <jet@gyve.org> writes:

> With --with-gtk, make claims that it cannot find x_find_image_file.
> I've removed static modifiers but I'm not sure this is true fix or not.

Thank you.  I just installed a (similar) fix for this.

-- 
Kim F. Storm <storm@cua.dk> http://www.cua.dk