projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Canvas: added some DECLARE_CLASS macros to stop it failing
[wxWidgets.git]
/
src
/
mac
/
gsocket.c
diff --git
a/src/mac/gsocket.c
b/src/mac/gsocket.c
index 49b8a92142e10f6f5f72d1e457e90fdbfed147ee..290f75ee641655730a2d99d98e9b7d0965f9c7e6 100644
(file)
--- a/
src/mac/gsocket.c
+++ b/
src/mac/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 */