Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected shutdown proc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-08-29 07:25:39 +00:00
parent 135ace6d7b
commit fb606749b3
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/carbon/gsocket.c
View File

@@ -84,7 +84,7 @@ extern pascal void OTDebugStr(const char* str);
#include <OTDebug.h> #include <OTDebug.h>
#endif #endif
InetSvcRef gInetSvcRef = 0 ; InetSvcRef gInetSvcRef = 0 ;
int gOTInited = 0 ;
OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode); OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
@@ -211,6 +211,7 @@ int GSocket_Verify_Inited()
return TRUE ; return TRUE ;
InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext); InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath, gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
NULL, &err, clientcontext); NULL, &err, clientcontext);
#else #else
@@ -218,6 +219,7 @@ int GSocket_Verify_Inited()
return TRUE ; return TRUE ;
InitOpenTransport() ; InitOpenTransport() ;
gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err); gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
#endif #endif
if ( gInetSvcRef == NULL || err != kOTNoError ) if ( gInetSvcRef == NULL || err != kOTNoError )
@@ -230,13 +232,16 @@ int GSocket_Verify_Inited()
void GSocket_Cleanup() void GSocket_Cleanup()
{ {
if ( gInetSvcRef != NULL ) if ( gOTInited != 0 )
OTCloseProvider( gInetSvcRef ); {
#if TARGET_CARBON if ( gInetSvcRef != NULL )
CloseOpenTransportInContext( NULL ) ; OTCloseProvider( gInetSvcRef );
#else #if TARGET_CARBON
CloseOpenTransport() ; CloseOpenTransportInContext( NULL ) ;
#endif #else
CloseOpenTransport() ;
#endif
}
} }
/* Constructors / Destructors for GSocket */ /* Constructors / Destructors for GSocket */

21
src/mac/gsocket.c
View File

@@ -84,7 +84,7 @@ extern pascal void OTDebugStr(const char* str);
#include <OTDebug.h> #include <OTDebug.h>
#endif #endif
InetSvcRef gInetSvcRef = 0 ; InetSvcRef gInetSvcRef = 0 ;
int gOTInited = 0 ;
OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode); OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
@@ -211,6 +211,7 @@ int GSocket_Verify_Inited()
return TRUE ; return TRUE ;
InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext); InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath, gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
NULL, &err, clientcontext); NULL, &err, clientcontext);
#else #else
@@ -218,6 +219,7 @@ int GSocket_Verify_Inited()
return TRUE ; return TRUE ;
InitOpenTransport() ; InitOpenTransport() ;
gOTInited = 1 ;
gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err); gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
#endif #endif
if ( gInetSvcRef == NULL || err != kOTNoError ) if ( gInetSvcRef == NULL || err != kOTNoError )
@@ -230,13 +232,16 @@ int GSocket_Verify_Inited()
void GSocket_Cleanup() void GSocket_Cleanup()
{ {
if ( gInetSvcRef != NULL ) if ( gOTInited != 0 )
OTCloseProvider( gInetSvcRef ); {
#if TARGET_CARBON if ( gInetSvcRef != NULL )
CloseOpenTransportInContext( NULL ) ; OTCloseProvider( gInetSvcRef );
#else #if TARGET_CARBON
CloseOpenTransport() ; CloseOpenTransportInContext( NULL ) ;
#endif #else
CloseOpenTransport() ;
#endif
}
} }
/* Constructors / Destructors for GSocket */ /* Constructors / Destructors for GSocket */