--- ray/src/rt/m_clip.c	2003/07/21 22:30:19	2.7
+++ ray/src/rt/m_clip.c	2005/04/19 01:15:06	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_clip.c,v 2.7 2003/07/21 22:30:19 schorsch Exp $";
+static const char	RCSid[] = "$Id: m_clip.c,v 2.9 2005/04/19 01:15:06 greg Exp $";
 #endif
 /*
  *  m_clip.c - routine for clipped (cut) objects.
@@ -8,6 +8,7 @@ static const char	RCSid[] = "$Id: m_clip.c,v 2.7 2003/
 #include "copyright.h"
 
 #include  "ray.h"
+#include  "rtotypes.h"
 
 /*
  *  Clipping objects permit holes and sections to be taken out
@@ -18,10 +19,11 @@ static const char	RCSid[] = "$Id: m_clip.c,v 2.7 2003/
  */
 
 
-int
-m_clip(m, r)			/* clip objects from ray */
-register OBJREC  *m;
-register RAY  *r;
+extern int
+m_clip(			/* clip objects from ray */
+	register OBJREC  *m,
+	register RAY  *r
+)
 {
 	OBJECT  cset[MAXSET+1], *modset;
 	OBJECT  obj, mod;
@@ -76,7 +78,7 @@ register RAY  *r;
 	r->newcset = cset;
 	if (strcmp(m->oargs.sarg[0], VOIDID)) {
 		int  inside = 0;
-		register RAY  *rp;
+		register const RAY  *rp;
 					/* check for penetration */
 		for (rp = r; rp->parent != NULL; rp = rp->parent)
 			if (!(rp->rtype & RAYREFL) && rp->parent->ro != NULL