merge of wxMac into main repository

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-09 10:54:44 +00:00 · 2000-08-09 10:54:44 +00:00 · 4a13f6e37e
commit 4a13f6e37e
parent 2040ececde
3 changed files with 4 additions and 1 deletions
--- a/src/tiff/makemac.mcp
+++ b/src/tiff/makemac.mcp
--- a/src/tiff/tif_luv.c
+++ b/src/tiff/tif_luv.c
@ -608,9 +608,12 @@ LogLuvEncodeTile(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
 #else
 #define LOGOF2		0.69314718055994530942
 #endif
+#ifndef log2
 #define log2(x)		((1./LOGOF2)*log(x))
+#endif
+#ifndef exp2
 #define exp2(x)		exp(LOGOF2*(x))
-
+#endif
 #define UVSCALE		410.

 static double
--- a/src/zlib/makemac.mcp
+++ b/src/zlib/makemac.mcp