--- ray/src/common/mat4.h	2003/02/22 02:07:22	2.4
+++ ray/src/common/mat4.h	2003/07/14 22:23:59	2.12
@@ -1,75 +1,22 @@
-/* RCSid: $Id: mat4.h,v 2.4 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: mat4.h,v 2.12 2003/07/14 22:23:59 schorsch Exp $ */
 /*
  * Definitions for 4x4 matrix operations
  */
+#ifndef _RAD_MAT4_H_
+#define _RAD_MAT4_H_
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include  <string.h>
 
 #include  "fvect.h"
 
-typedef FLOAT  MAT4[4][4];
-
-#ifdef  BSD
-#define  copymat4(m4a,m4b)	bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
-#else
-#define  copymat4(m4a,m4b)	(void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
+#ifdef __cplusplus
+extern "C" {
 #endif
 
+typedef RREAL  MAT4[4][4];
+
+#define  copymat4(m4a,m4b)	(void)memcpy((void *)m4a,(void *)m4b,sizeof(MAT4))
+
 #define  MAT4IDENT		{ {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
 				{0.,0.,1.,0.}, {0.,0.,0.,1.} }
 
@@ -77,18 +24,15 @@ extern MAT4  m4ident;
 
 #define  setident4(m4)		copymat4(m4, m4ident)
 
-#ifdef NOPROTO
 
-extern void	multmat4();
-extern void	multv3();
-extern void	multp3();
-extern int	invmat4();
-
-#else
-
 extern void	multmat4(MAT4 m4a, MAT4 m4b, MAT4 m4c);
 extern void	multv3(FVECT v3a, FVECT v3b, MAT4 m4);
 extern void	multp3(FVECT p3a, FVECT p3b, MAT4 m4);
 extern int	invmat4(MAT4 inverse, MAT4 mat);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_MAT4_H_ */
+