introduction of image.c breaks build

[Tim Van Holder]

The build currently break due to the changes made as part of the 
indtroduction of image.c.

There are 2 problems:
- XOBJ only gets image.o in one situation
- image.c has x_find_image_file as a static, but xfns expects to have it 
too if GTK is in use

The naive patch below addresses both, although not necessarily in the 
best way.

In GNU Emacs 21.3.50.1 (i686-pc-linux-gnu, GTK+ Version 2.0.6)
of 2004-03-11 on leeloo
configured using `configure '--with-png' '--with-tiff' '--with-jpeg' 
'--with-gif' '--prefix=/opt/gcc3' 'CFLAGS=-gstabs+3' '--with-gtk''

Index: src/dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.166
diff -u -u -p -d -r1.166 src/dispextern.h
--- src/dispextern.h    11 Mar 2004 00:29:12 -0000    1.166
+++ src/dispextern.h    11 Mar 2004 08:26:46 -0000
@@ -2609,6 +2609,7 @@ extern void x_destroy_bitmap P_ ((struct
#endif
extern void x_destroy_all_bitmaps P_ ((Display_Info *));
extern int x_create_bitmap_mask P_ ((struct frame * , int));
+extern Lisp_Object x_find_image_file P_ (( Lisp_Object ));

/* Defined in sysdep.c */

Index: src/image.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/image.c,v
retrieving revision 1.3
diff -u -u -p -d -r1.3 src/image.c
--- src/image.c    11 Mar 2004 05:56:41 -0000    1.3
+++ src/image.c    11 Mar 2004 08:27:25 -0000
@@ -2005,7 +2005,6 @@ x_put_x_image (f, ximg, pixmap, width, h
                  File Handling
 ***********************************************************************/

-static Lisp_Object x_find_image_file P_ ((Lisp_Object));
static unsigned char *slurp_file P_ ((char *, int *));


@@ -2013,7 +2012,7 @@ static unsigned char *slurp_file P_ ((ch
   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/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.292
diff -u -u -p -d -r1.292 src/Makefile.in
--- src/Makefile.in    11 Mar 2004 00:29:25 -0000    1.292
+++ src/Makefile.in    11 Mar 2004 08:28:12 -0000
@@ -310,9 +310,9 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOO
/* Include xmenu.o in the list of X object files.  */

#ifdef USE_GTK
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o 
fringe.o image.o
#else
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
#endif

/* The X Menu stuff is present in the X10 distribution, but missing
Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.607
diff -u -u -p -d -r1.607 src/xfns.c
--- src/xfns.c    11 Mar 2004 00:25:38 -0000    1.607
+++ src/xfns.c    11 Mar 2004 08:28:56 -0000
@@ -761,8 +761,6 @@ x_set_wait_for_wm (f, new_value, old_val

#ifdef USE_GTK

-static 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.  */


-- This e-mail was scanned by RAV Antivirus --