wxTheColourDatabase->Find() can fail.

[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 570e2db556c8f66f5ec0b145833443a8dc7b96ec..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$

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


@@ -21,19 +23,25 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

+#ifndef OTUNIXERRORS
+

 #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>
 

+#endif
+

 /* Definition of GSocket */
 class GSocket
 {
 public:
     GSocket();
     ~GSocket();
 /* Definition of GSocket */
 class GSocket
 {
 public:
     GSocket();
     ~GSocket();

-    bool IsOK() { return m_ok; }
+    bool IsOk() { return m_ok; }

 
     void Shutdown();
     GSocketError SetLocal(GAddress *address);
 
     void Shutdown();
     GSocketError SetLocal(GAddress *address);