Commit Diff

Commit:
c619cc2cb9023d3f6ed9db515ff37b6479795245
From:
rsc <devnull@localhost>
Date:
Message:
more name conflicts
Actions:
Patch | Tree
commit - 60ee9140427f2b5e3d41a834cc48996c040a69bc
commit + c619cc2cb9023d3f6ed9db515ff37b6479795245
blob - d96497c857957298e6a05c61a3307623e718289e
blob + 959ccfce826f2a6bb28b3c233c2ce48cb98c79a5
--- src/cmd/map/map.h
+++ src/cmd/map/map.h
@@ -110,6 +110,10 @@ void	findxy(double, double *, double *);
 void	albscale(double, double, double, double);
 void	invalb(double, double, double *, double *);
 
+#define csqrt map_csqrt	/* conflicts on FreeBSD 5 with gcc builtins */
+#define cpow map_cpow
+#define sincos map_sincos
+
 void	cdiv(double, double, double, double, double *, double *);
 void	cmul(double, double, double, double, double *, double *);
 void	cpow(double, double, double *, double *, double);