]> git.saurik.com Git - wxWidgets.git/commitdiff
fixing compilo on carbon cfm with CW 9
authorStefan Csomor <csomor@advancedconcepts.ch>
Wed, 13 Apr 2005 05:07:39 +0000 (05:07 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Wed, 13 Apr 2005 05:07:39 +0000 (05:07 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/carbon/gsockmac.h

index 0b73be833efea8da28759511100619b52f36b773..cb38767cebf4a6adcc378bfce456cdae9cd824e2 100644 (file)
@@ -25,6 +25,8 @@
 
 #include <MacHeaders.c>
 #define OTUNIXERRORS 1
+// we get a conflict in OT headers otherwise :
+#undef EDEADLK
 #include <OpenTransport.h>
 #include <OpenTransportProviders.h>
 #include <OpenTptInternet.h>