X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe942d6f1d8d85c944a322b76838ac94f2b04181..b377eda09d9eca8810cee1c252879bee3c9bd190:/include/wx/mac/carbon/gsockmac.h

diff --git a/include/wx/mac/carbon/gsockmac.h b/include/wx/mac/carbon/gsockmac.h
index 49bd37d033..de035d0d40 100644
--- a/include/wx/mac/carbon/gsockmac.h
+++ b/include/wx/mac/carbon/gsockmac.h
@@ -1,8 +1,10 @@
 /* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockunx.h
- * Purpose: GSocket Macintosh header
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket) for WX
+ * Name:        gsockunx.h
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket Macintosh header
+ * CVSID:       $Id$
  * -------------------------------------------------------------------------
  */
 
@@ -21,12 +23,18 @@
 #include "gsocket.h"
 #endif
 
+#ifndef OTUNIXERRORS
+
 #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>
 
+#endif
+
 /* Definition of GSocket */
 class GSocket
 {