Pruned some of txrc.tex; removed redundant helpxlp files.

[wxWidgets.git] / src / mac / carbon / gsocket.c

diff --git a/src/mac/carbon/gsocket.c b/src/mac/carbon/gsocket.c
index 54114255567e56373bf3aa48d1b80e568ed29a99..290f75ee641655730a2d99d98e9b7d0965f9c7e6 100644 (file)
--- a/src/mac/carbon/gsocket.c
+++ b/src/mac/carbon/gsocket.c
@@ -15,6 +15,7 @@
 
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"
 
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"

+#include "wx/platform.h"

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)


@@ -29,6 +30,7 @@
     #define TRUE 1
   #endif
 #else
     #define TRUE 1
   #endif
 #else

+  #include <MacHeaders.c>

   #define OTUNIXERRORS 1
   #include <OpenTransport.h>
   #include <OpenTransportProviders.h>
   #define OTUNIXERRORS 1
   #include <OpenTransport.h>
   #include <OpenTransportProviders.h>


@@ -84,7 +86,7 @@ extern pascal void OTDebugStr(const char* str);
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;

-
+int gOTInited = 0 ;

 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 
 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 


@@ -211,6 +213,7 @@ int GSocket_Verify_Inited()
       return TRUE ;
 
     InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
       return TRUE ;
 
     InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);

+    gOTInited = 1 ;

     gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
                                                NULL, &err, clientcontext);
 #else  
     gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
                                                NULL, &err, clientcontext);
 #else  


@@ -218,6 +221,7 @@ int GSocket_Verify_Inited()
       return TRUE ;
  
     InitOpenTransport() ;
       return TRUE ;
  
     InitOpenTransport() ;

+    gOTInited = 1 ;

     gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #endif
     if ( gInetSvcRef == NULL ||  err != kOTNoError )
     gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #endif
     if ( gInetSvcRef == NULL ||  err != kOTNoError )


@@ -230,13 +234,16 @@ int GSocket_Verify_Inited()
 
 void GSocket_Cleanup()
 {
 
 void GSocket_Cleanup()
 {

-  if ( gInetSvcRef != NULL )
-       OTCloseProvider( gInetSvcRef );
-#if TARGET_CARBON
-  CloseOpenTransportInContext( NULL ) ;
-#else
-  CloseOpenTransport() ;
-#endif
+    if ( gOTInited != 0 )
+    {
+      if ( gInetSvcRef != NULL )
+       OTCloseProvider( gInetSvcRef );
+    #if TARGET_CARBON
+      CloseOpenTransportInContext( NULL ) ;
+    #else
+      CloseOpenTransport() ;
+    #endif
+    }

 }
 
 /* Constructors / Destructors for GSocket */
 }
 
 /* Constructors / Destructors for GSocket */


@@ -267,7 +274,7 @@ GSocket *GSocket_new()
   socket->m_server              = FALSE;
   socket->m_stream              = TRUE;
   socket->m_non_blocking        = FALSE;
   socket->m_server              = FALSE;
   socket->m_stream              = TRUE;
   socket->m_non_blocking        = FALSE;

-  socket->m_timeout             = 10*1000;
+  socket->m_timeout             = 1*1000;

                                 /* 10 sec * 1000 millisec */
   socket->m_takesEvents                        = TRUE ;
   socket->m_mac_events                 = wxMacGetNotifierTable() ;
                                 /* 10 sec * 1000 millisec */
   socket->m_takesEvents                        = TRUE ;
   socket->m_mac_events                 = wxMacGetNotifierTable() ;


@@ -1473,7 +1480,7 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
     {
        OTResult state ;
                OTByteCount sz = 0 ;
     {
        OTResult state ;
                OTByteCount sz = 0 ;

-               state = OTGetEndpointState(socket->m_endpoint);
+                 state = OTGetEndpointState(socket->m_endpoint);

   
                OTCountDataBytes( socket->m_endpoint , &sz ) ;
                if ( state == T_INCON || sz > 0 )
   
                OTCountDataBytes( socket->m_endpoint , &sz ) ;
                if ( state == T_INCON || sz > 0 )