added cw6 fixes and patrick's patches

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

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 86e17b88c0a99051ea98b83941a058f7d2c382a5..34b7fe57ead7aaf95669ba7c8310b2fc1ab584f6 100644 (file)
--- 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 86e17b88c0a99051ea98b83941a058f7d2c382a5..34b7fe57ead7aaf95669ba7c8310b2fc1ab584f6 100644 (file)
--- 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 (file)
Binary files a/src/makemac.mcp and b/src/makemac.mcp differ