use wxNullPtr instead of NULL with wxFileTypeInfo

[wxWidgets.git] / include / wx / mac / carbon / gsockmac.h

diff --git a/include/wx/mac/carbon/gsockmac.h b/include/wx/mac/carbon/gsockmac.h
index 0b73be833efea8da28759511100619b52f36b773..de035d0d4011ae6393fcb702b7e28d152aeb2ee3 100644 (file)
--- 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$

  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 


@@ -25,6 +27,8 @@
 
 #include <MacHeaders.c>
 #define OTUNIXERRORS 1
 
 #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>
 #include <OpenTransport.h>
 #include <OpenTransportProviders.h>
 #include <OpenTptInternet.h>