From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 9 Aug 2000 10:54:44 +0000 (+0000)
Subject: merge of wxMac into main repository
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4a13f6e37eaa63fc3871015a7a1ae171c58d8a34

merge of wxMac into main repository


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/tiff/makemac.mcp b/src/tiff/makemac.mcp
new file mode 100644
index 0000000000..6b7f2ef158
Binary files /dev/null and b/src/tiff/makemac.mcp differ
diff --git a/src/tiff/tif_luv.c b/src/tiff/tif_luv.c
index 413c6c1e2f..5adaa54e0f 100644
--- 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
diff --git a/src/zlib/makemac.mcp b/src/zlib/makemac.mcp
new file mode 100644
index 0000000000..576ae208bc
Binary files /dev/null and b/src/zlib/makemac.mcp differ