From e9d7ad4dbf0cbbefb0404377506555cf0012014a Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 10 Dec 2000 14:41:41 +0000
Subject: [PATCH 1/1] added cw6 fixes and patrick's patches

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/thread.cpp |   2 +-
 src/mac/thread.cpp        |   2 +-
 src/makemac.mcp           | Bin 527388 -> 527388 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 86e17b88c0..34b7fe57ea 100644
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -801,7 +801,7 @@ bool wxThreadModule::OnInit()
 	long response;
 	bool hasThreadManager ;
 	hasThreadManager = Gestalt( gestaltThreadMgrAttr, &response) == noErr && response & 1;
-#if GENERATINGPOWERPC || GENERATINGCFM
+#if TARGET_RT_MAC_CFM
 	// verify presence of shared library
 	hasThreadManager = hasThreadManager && ((Ptr)NewThread != (Ptr)kUnresolvedCFragSymbolAddress);
 #endif
diff --git a/src/mac/thread.cpp b/src/mac/thread.cpp
index 86e17b88c0..34b7fe57ea 100644
--- a/src/mac/thread.cpp
+++ b/src/mac/thread.cpp
@@ -801,7 +801,7 @@ bool wxThreadModule::OnInit()
 	long response;
 	bool hasThreadManager ;
 	hasThreadManager = Gestalt( gestaltThreadMgrAttr, &response) == noErr && response & 1;
-#if GENERATINGPOWERPC || GENERATINGCFM
+#if TARGET_RT_MAC_CFM
 	// verify presence of shared library
 	hasThreadManager = hasThreadManager && ((Ptr)NewThread != (Ptr)kUnresolvedCFragSymbolAddress);
 #endif
diff --git a/src/makemac.mcp b/src/makemac.mcp
index 587475ed7a9649fd84ed1cab49cd2052ba3f723b..d73c8a78cfaa1c660f2a442dc4897fb6fd2e0a2f 100644
GIT binary patch
delta 1084
zcmYk5e`pj(6vt=Y&g`tYTbq-3i5C-2LqhbbXlNA_+C-{ULogCg{BgAhF>1u<VG=Z&
z1Zk66w11eyGJ+BEmr=ANFg8P_UKLu9w2f4>V2ffR!Jp9>rHGMi-`)@L!R@^7cR%}X
zcHf)slfmwj!Tu2ac#IH(5K{C7A;q}D7zsO$^EJgBZzL8sr3ld+ju|HqQ&AcOYhY9P
zFd-#v>RV&;v}lUSHjy!rL5&&B&cJI1fe7Y+zZ?&04}o22ZKJjc)S*uNhYz)nKtoDr
z&p<tcK)qUFHw!i5wHQlmA)e)76uJg;DpgV5K?d-&tACnbU7X`&473`VOfLAGo>hAn
zzb;ULSr+pq_e4gq+-OJHYW1`HhsyCbBOqr_(k%7ImQ~D-5K3{^c%e|I$HP3sQ1hz4
zYQ<Oe{pmP&TGWg3H?-@A`+nCMB4p#$grj~NUBwcX<2>w1LiW=%wC|@RRQPP6`_X(u
zj`Q|X5(-ZwpzDNubS>%By-GXVtCEkk|2O1QyTY4UM<vsXmP3i5?|(p-)+)>V7j(!&
zzoGh23qAI!SXN!Xvu1Zp)62AvcJ&;v^sjMh6qrTp+{Sj4J<<asw0^4&G*QNw+XTIM
zB}{QzBNvr}A0Vbn%i*RqegA=~hJCerb`Y|%kr18VLZeI`KEhe=(lTJoZI^52f^Odc
z6()20b!2KA=&5bS!x+cj!<ZcJ<U#HE+c*_^-}s%f$@v_oAx%8_kcDn>9EX%4pHLps
z+kr<+bu}vp@|l+x>%1>vmdV^Xke^h;d40pjZ=dEkG%%+7`*`mTjsue}*_>_GoZ<EF
z40-pm8IqggW}#ddH;eVXQhE+_#RJI9@2FfZubhA;y|z&-@u=?CRYEsRn1heatT-Xe
zt3SIVfCX{}QAFw*VptTX`(1cPWOP{g%`ko{gqw%OZ9A7*mG9B+{HMY@A!E-)02tBV
zJr|FSKvMw0XsWDxFj8TIJpNM56i_w~0ZU(aDP9Nz*3Xwclfs{GyJsR3AFIXHJwM5S
zjYkvo%}KF_L8SBhpoQ#QyqRX*vy}{pP9W?3alQ4Ik;|=LP^4eaEuIRyM3ypZrr>t2
LOX~=;u898u=yWX`

delta 1232
zcmZwGe@xV690%~{dA`s0$DN&loriZPctx=<3Pw4w=7!!@tOeG!pjo0_i89+5Y}Q6u
zXl3Cau0^+cnAzrZOCkv58~14HX%7E!&ZRL1mKl(Vg!~Xh0@n4uJ8=Ec^WE$DKKHrz
z_xaxUx#xSJ-glth*Sdn{4iTadLNZ<;#Kf5m5q~)$tuH^nHj7rT)f&ruuVxs8PzFm>
zBvisGtswO=qg}f9N2A?k)?Vcmn-y^y+!{>kROD$xO=s3E&j6(~)U`BVm6sTt<I<>=
zk@^k~wb`83u?M5}x&RN?C`nvoKSLX=%EzYCWx$}DxOGxop<;B8;t@+{sMETzv4A@^
z63m9*fW|81Xo+f9tjsMR)EMpI^Ie22%eKY}r)j9U--XI_FdFU1idU?2*9&;OL`aq`
z5poR0LN}VD(Mzimp+|;S;(5Y1PZClcOoU2q$3hbhLQ>p`O2vdrN5w<P1LEiw#oboa
zN3D-0FD6?Hv~DKv?4%!4nX`sHuE_rT>FVt=)6Y1U%Zpi%%bNG;-Zdik3+8Pr`jUnY
zRvWS-LY4H;-NF$W?xQ<4*9Giicdg2ge6oRYx%z1~rP4ByQ^;KMxk7f)$SZ&H{|;g+
zs>0gF+B(|wL{4Iu=<_cu8mjZB%j{ydgvsX3Y`qrycgl>~ysb>;ZB<&U#AK&p%7tA@
z{R%Njxf$;yMn5eV!&y8K>r9!S&AU6rFjdWXC$}-RRFk{kVzX47HPiurJ8l?(WAGjP
z02Um9Z=elYpb372({KX5hekLnuGv&U{|VK2Dn*}NHFx!)It=|V05@O+?!ZmJ#wFu0
z0e`?>a2NiBTW}jD;W`Y$DD=V@{0{lB9yY-tI1H_D6iyMckVp*9!4>#B)ac!r*@005
zd<)GGhU0);L(V`C%)(S?pY28WFBts_SK&9f2GcO}nLSN31X+RfI@A+PUQSkfz7ij{
zsHXh6Mcq>_9!=3qxhq9`{cCajlxEi2BAT>C^xS3IeOMH3$fvIAjC-6|Z(dsQX4MW%
zs=-`yJ}iR0x=V9oqayrnuioSEk`lbt_tN(HEFq~6iK-FZ!<1RMZ$uwdJVpS);M}we
z{u9g-pN{K`b^3N}UM`!)^)X$c@1==@GrB7+wE)p1T(%u&yfkx-`B%l$oiqBgoE5+E
zxz9lMC44)dO`eYuw&6UoMtiYwN%6AM%lI(=c#H0ZNa{ARjvI@0_S(u=T9$I-jQ%ex
CfL^`;

-- 
2.50.0