From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 13 Apr 2005 05:07:39 +0000 (+0000)
Subject: fixing compilo on carbon cfm with CW 9
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/85f70304242306b7c6ae602f3e619948996f2386

fixing compilo on carbon cfm with CW 9


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

diff --git a/include/wx/mac/carbon/gsockmac.h b/include/wx/mac/carbon/gsockmac.h
index 0b73be833e..cb38767ceb 100644
--- a/include/wx/mac/carbon/gsockmac.h
+++ b/include/wx/mac/carbon/gsockmac.h
@@ -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>