--- a/src/glyphs.c	Mon Aug 13 08:48:43 2007 +0200
+++ b/src/glyphs.c	Mon Aug 13 08:49:20 2007 +0200
@@ -1060,7 +1060,7 @@
 {
   Error_behavior errb = decode_error_behavior_flag (no_error);
 
-  return call_with_suspended_errors (make_image_instance_1,
+  return call_with_suspended_errors ((lisp_fn_t) make_image_instance_1,
 				     Qnil, Qimage, errb,
 				     3, data, device, dest_types);
 }
@@ -1357,7 +1357,7 @@
  ****************************************************************************/
 
 static int
-nothing_possible_dest_types ()
+nothing_possible_dest_types (void)
 {
   return IMAGE_NOTHING_MASK;
 }
@@ -1399,7 +1399,7 @@
 }
 
 static int
-inherit_possible_dest_types ()
+inherit_possible_dest_types (void)
 {
   return IMAGE_MONO_PIXMAP_MASK;
 }
@@ -1425,7 +1425,7 @@
 }
 
 static int
-string_possible_dest_types ()
+string_possible_dest_types (void)
 {
   return IMAGE_TEXT_MASK;
 }
@@ -1461,7 +1461,7 @@
 }
 
 static int
-formatted_string_possible_dest_types ()
+formatted_string_possible_dest_types (void)
 {
   return IMAGE_TEXT_MASK;
 }
@@ -1769,12 +1769,11 @@
       Lisp_Object newinst;
       Lisp_Object contype = XCAR (rest);
 
-      newinst = call_with_suspended_errors (normalize_image_instantiator,
-					    Qnil, Qimage, ERROR_ME_NOT,
-					    3, instantiator, contype,
-					    make_int
-					    (XIMAGE_SPECIFIER_ALLOWED
-					     (specifier)));
+      newinst = call_with_suspended_errors
+	((lisp_fn_t) normalize_image_instantiator,
+	 Qnil, Qimage, ERROR_ME_NOT, 3, instantiator, contype,
+	 make_int (XIMAGE_SPECIFIER_ALLOWED (specifier)));
+
       if (!NILP (newinst))
 	{
 	  Lisp_Object newtag;