--- a/src/floatfns.c	Mon Aug 13 10:33:19 2007 +0200
+++ b/src/floatfns.c	Mon Aug 13 10:34:13 2007 +0200
@@ -929,6 +929,9 @@
 
 #endif /* FLOAT_CATCH_SIGILL */
 
+/* In C++, it is impossible to determine what type matherr expects
+   without some more configure magic.
+   We shouldn't be using matherr anyways - it's a non-standard SYSVism. */
 #if defined (HAVE_MATHERR) && !defined(__cplusplus)
 int
 matherr (struct exception *x)
@@ -947,11 +950,11 @@
                         : Qnil)));
   switch (x->type)
     {
-    case DOMAIN:	Fsignal (Qdomain_error, args);		break;
-    case SING:		Fsignal (Qsingularity_error, args);	break;
-    case OVERFLOW:	Fsignal (Qoverflow_error, args);	break;
-    case UNDERFLOW:	Fsignal (Qunderflow_error, args);	break;
-    default:		Fsignal (Qarith_error, args);		break;
+    case DOMAIN:    Fsignal (Qdomain_error,	 args); break;
+    case SING:	    Fsignal (Qsingularity_error, args); break;
+    case OVERFLOW:  Fsignal (Qoverflow_error,	 args); break;
+    case UNDERFLOW: Fsignal (Qunderflow_error,	 args); break;
+    default:	    Fsignal (Qarith_error,	 args); break;
     }
   return 1;	/* don't set errno or print a message */
 }