diff src/specifier.c @ 74:54cc21c15cbb r20-0b32

Import from CVS: tag r20-0b32
author cvs
date Mon, 13 Aug 2007 09:04:33 +0200
parents 131b0175ea99
children 6a378aca36af
line wrap: on
line diff
--- a/src/specifier.c	Mon Aug 13 09:03:47 2007 +0200
+++ b/src/specifier.c	Mon Aug 13 09:04:33 2007 +0200
@@ -1048,10 +1048,10 @@
 	  struct gcpro gcpro1;
 
 	  GCPRO1 (opaque);
-	  retval = call_with_suspended_errors (call_validate_method,
-					       Qnil,
-					       Qspecifier, errb, 2,
-					       opaque, instantiator);
+	  retval = call_with_suspended_errors
+	    ((lisp_fn_t) call_validate_method,
+	     Qnil, Qspecifier, errb, 2, opaque, instantiator);
+	  
 	  free_opaque_ptr (opaque);
 	  UNGCPRO;
 	}
@@ -2151,10 +2151,10 @@
 	  struct gcpro gcpro1;
 
 	  GCPRO1 (opaque);
-	  retval = call_with_suspended_errors (call_validate_matchspec_method,
-					       Qnil,
-					       Qspecifier, errb, 2,
-					       opaque, matchspec);
+	  retval = call_with_suspended_errors
+	    ( (lisp_fn_t) call_validate_matchspec_method,
+	      Qnil, Qspecifier, errb, 2, opaque, matchspec);
+	  
 	  free_opaque_ptr (opaque);
 	  UNGCPRO;
 	}
@@ -2275,11 +2275,10 @@
 	  Lisp_Object val = XCDR (tagged_inst);
 
 	  if (HAS_SPECMETH_P (sp, instantiate))
-	    val = call_with_suspended_errors (RAW_SPECMETH (sp, instantiate),
-					      Qunbound, Qspecifier, errb,
-					      5, specifier, matchspec, domain,
-					      XCDR (tagged_inst),
-					      depth);
+	    val = call_with_suspended_errors
+	      ( (lisp_fn_t) RAW_SPECMETH (sp, instantiate),
+		Qunbound, Qspecifier, errb, 5, specifier,
+		matchspec, domain, XCDR (tagged_inst), depth);
 
 	  if (!UNBOUNDP (val))
 	    {