diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.c wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.c
--- wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.c	2004-12-12 04:58:35.000000000 -0500
+++ wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.c	2011-04-27 11:02:11.000000000 -0400
@@ -2302,7 +2302,7 @@
 }
 
 /*****************************************************************************/
-
+/*
 OSErr
 FSVolumeMount(
 	const void *volMountInfo,
@@ -2310,23 +2310,23 @@
 {
 	OSErr			result;
 	ParamBlockRec	pb;
-
+	*/
 	/* check parameters */
-	require_action(NULL != volRefNum, BadParameter, result = paramErr);
+	/*	require_action(NULL != volRefNum, BadParameter, result = paramErr);
 	
 	pb.ioParam.ioBuffer = (Ptr)volMountInfo;
 	result = PBVolumeMount(&pb);
 	require_noerr(result, PBVolumeMount);
-	
+	*/
 	/* return the volume reference number */
-	*volRefNum = pb.ioParam.ioVRefNum;
+	/*	*volRefNum = pb.ioParam.ioVRefNum;
 
 PBVolumeMount:
 BadParameter:
 
 	return ( result );
 }
-
+	*/
 /*****************************************************************************/
 
 OSErr
diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.cpp wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.cpp
--- wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.cpp	2004-10-17 06:52:37.000000000 -0400
+++ wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.cpp	2011-04-27 11:04:40.000000000 -0400
@@ -2304,7 +2304,7 @@
 }
 
 /*****************************************************************************/
-
+/*
 OSErr
 FSVolumeMount(
 	const void *volMountInfo,
@@ -2312,23 +2312,23 @@
 {
 	OSErr			result;
 	ParamBlockRec	pb;
-
+*/
 	/* check parameters */
-	require_action(NULL != volRefNum, BadParameter, result = paramErr);
+	/*	require_action(NULL != volRefNum, BadParameter, result = paramErr);
 	
 	pb.ioParam.ioBuffer = (Ptr)volMountInfo;
 	result = PBVolumeMount(&pb);
 	require_noerr(result, PBVolumeMount);
-	
+	*/
 	/* return the volume reference number */
-	*volRefNum = pb.ioParam.ioVRefNum;
+	/*	*volRefNum = pb.ioParam.ioVRefNum;
 
 PBVolumeMount:
 BadParameter:
 
 	return ( result );
 }
-
+	*/
 /*****************************************************************************/
 
 OSErr
diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.h wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.h
--- wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.h	2004-12-12 05:00:39.000000000 -0500
+++ wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.h	2011-04-27 11:05:46.000000000 -0400
@@ -1479,14 +1479,14 @@
 */
 
 /*****************************************************************************/
-
+/*
 #pragma mark FSVolumeMount
 
 OSErr
 FSVolumeMount(
-	const void *volMountInfo,
+	UInt8 *volMountInfo,
 	FSVolumeRefNum *volRefNum);
-
+*/
 /*
 	The VolumeMount function mounts a volume using a volume mounting
 	information record.
diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/thread.cpp wxWidgets-2.6.4/src/mac/carbon/thread.cpp
--- wxWidgets-2.6.4-orig/src/mac/carbon/thread.cpp	2005-07-24 09:36:12.000000000 -0400
+++ wxWidgets-2.6.4/src/mac/carbon/thread.cpp	2011-04-27 11:06:38.000000000 -0400
@@ -1019,7 +1019,7 @@
     wxThreadInternal *pthread = thread->m_internal;
 
     // add to TLS so that This() will work
-	verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (long) thread ) ) ;
+	verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (void *) thread ) ) ;
 
     // have to declare this before pthread_cleanup_push() which defines a
     // block!