Added some WXDLLEXPORTs

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

diff --git a/src/mac/gsocket.c b/src/mac/gsocket.c
index ed895445f299e67b7e11378f8063caf8ea58e048..10ee5d838dbbcc4cdb7a38276b2dfd6ae2897035 100644 (file)
--- a/src/mac/gsocket.c
+++ b/src/mac/gsocket.c
@@ -19,7 +19,7 @@
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 

-#ifdef __UNIX__
+#ifdef __DARWIN__

   #include <CoreServices/CoreServices.h>
 
   #ifndef FALSE
   #include <CoreServices/CoreServices.h>
 
   #ifndef FALSE


@@ -80,7 +80,7 @@ void wxCYield() ;
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif

-#ifndef __UNIX__
+#ifndef __DARWIN__

   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;


@@ -121,7 +121,7 @@ OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode)
        ret.opt.maxlen = kOTFourByteOptionSize;
 
        opt->level      = INET_IP;                                      // dealing with an IP Level function
        ret.opt.maxlen = kOTFourByteOptionSize;
 
        opt->level      = INET_IP;                                      // dealing with an IP Level function

-#ifdef __UNIX__
+#ifdef __DARWIN__

        opt->name       = kIP_REUSEADDR;
 #else
        opt->name       = IP_REUSEADDR;
        opt->name       = kIP_REUSEADDR;
 #else
        opt->name       = IP_REUSEADDR;


@@ -195,19 +195,25 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 
 int GSocket_Init()
 {
 
 int GSocket_Init()
 {

-       OSStatus err ;
+    OSStatus err ;

 #if TARGET_CARBON
 #if TARGET_CARBON

-       InitOpenTransportInContext( kInitOTForApplicationMask , NULL ) ;
+    // Marc Newsam: added the clientcontext variable
+    //              however, documentation is unclear how this works
+    OTClientContextPtr clientcontext;
+
+    InitOpenTransportInContext(kInitOTForApplicationMask, &clientcontext);
+    gInetSvcRef = OTOpenInternetServicesInContext(kDefaultInternetServicesPath,
+                                               NULL, &err, clientcontext);

 #else  
 #else  

-       InitOpenTransport() ;
+    InitOpenTransport() ;
+    gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);

 #endif
 #endif

-       gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
-       if ( gInetSvcRef == NULL ||  err != kOTNoError )
-       {
-               OTAssert("Could not open Inet Services", err == noErr);
-               return FALSE ;
-       }
-  return TRUE;
+    if ( gInetSvcRef == NULL ||  err != kOTNoError )
+    {
+       OTAssert("Could not open Inet Services", err == noErr);
+       return FALSE ;
+    }
+    return TRUE;

 }
 
 void GSocket_Cleanup()
 }
 
 void GSocket_Cleanup()