--- ray/src/common/rtmath.h	2003/07/14 22:23:59	3.3
+++ ray/src/common/rtmath.h	2016/03/10 18:56:34	3.12
@@ -1,4 +1,4 @@
-/* RCSid $Id: rtmath.h,v 3.3 2003/07/14 22:23:59 schorsch Exp $ */
+/* RCSid $Id: rtmath.h,v 3.12 2016/03/10 18:56:34 schorsch Exp $ */
 /*
  * Header for Radiance vector and math routines
  */
@@ -8,13 +8,12 @@
 
 #include  <math.h>
 
-#include  "tifftypes.h"
+#include  "tiff.h"		/* needed for int32, etc. */
 #include  "mat4.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 				/* regular transformation */
 typedef struct {
 	MAT4  xfm;				/* transform matrix */
@@ -33,8 +32,11 @@ typedef struct {
 #define	 PI		3.14159265358979323846
 #endif
 #endif
+					/* defined in tcos.c */
+extern double	tcos(double x);
+extern double	atan2a(double y, double x);
 
-#ifdef  FASTMATH
+#ifdef  __FAST_MATH__
 #define  tcos			cos
 #define  tsin			sin
 #define  ttan			tan
@@ -43,8 +45,7 @@ typedef struct {
 #define  tsin(x)		tcos((x)-(PI/2.))
 #define  ttan(x)		(tsin(x)/tcos(x))
 #endif
-					/* defined in tcos.c */
-extern double	tcos(double x);
+
 					/* defined in xf.c */
 extern int	xf(XF *ret, int ac, char *av[]);
 extern int	invxf(XF *ret, int ac, char *av[]);