X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6b1d97e741fda8d579fa21cbc89f0c91615cef..7ef4c90b0a4a657d2d34a21b397dfe20b565f894:/src/mac/carbon/gsocket.c

diff --git a/src/mac/carbon/gsocket.c b/src/mac/carbon/gsocket.c
index 5b36717505..20e4049f58 100644
--- a/src/mac/carbon/gsocket.c
+++ b/src/mac/carbon/gsocket.c
@@ -19,6 +19,25 @@
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
+#ifdef __UNIX__
+  #include <CoreServices/CoreServices.h>
+
+  #ifndef FALSE
+    #define FALSE 0
+  #endif
+  #ifndef TRUE
+    #define TRUE 1
+  #endif
+#else
+  #define OTUNIXERRORS 1
+  #include <OpenTransport.h>
+  #include <OpenTransportProviders.h>
+  #include <OpenTptInternet.h>
+#endif
+#if TARGET_CARBON
+  #define OTAssert( str , cond ) /* does not exists in Carbon */
+#endif
+
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
@@ -27,13 +46,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <ctype.h>
-#define OTUNIXERRORS 1
-#include <OpenTransport.h>
-#include <OpenTransportProviders.h>
-#include <OpenTptInternet.h>
-#if TARGET_CARBON
-	#define OTAssert( str , cond ) /* does not exists in Carbon */
-#endif
 #include <utime.h>
 
 /*
@@ -68,7 +80,9 @@ void wxCYield() ;
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif
-#include <OTDebug.h>
+#ifndef __UNIX__
+  #include <OTDebug.h>
+#endif
 InetSvcRef gInetSvcRef = 0 ;
 
 
@@ -107,7 +121,11 @@ OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode)
 	ret.opt.maxlen = kOTFourByteOptionSize;
 
 	opt->level	= INET_IP;					// dealing with an IP Level function
+#ifdef __UNIX__
+	opt->name	= kIP_REUSEADDR;
+#else
 	opt->name	= IP_REUSEADDR;
+#endif
 	opt->len	= kOTFourByteOptionSize;
 	opt->status = 0;
 	*(UInt32*)opt->value = enableReuseIPMode;		// set the desired option level, true or false
@@ -177,19 +195,25 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 
 int GSocket_Init()
 {
-	OSStatus err ;
+    OSStatus err ;
 #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	
-	InitOpenTransport() ;
+    InitOpenTransport() ;
+    gInetSvcRef = OTOpenInternetServices(kDefaultInternetServicesPath, NULL, &err);
 #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()
@@ -353,7 +377,6 @@ GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
 GAddress *GSocket_GetLocal(GSocket *socket)
 {
   GAddress *address = NULL ;
-  InetAddress addr;
   GSocketError err;
   InetAddress loc ;
 
@@ -1028,8 +1051,8 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 {
 	OTFlags flags ;
 	OTResult res ;
+	OTByteCount sz = 0 ;
 
-	size_t sz = 0 ;
   	OTCountDataBytes( socket->m_endpoint , &sz ) ;
 	res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
 	if ( res < 0 )
@@ -1040,7 +1063,7 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 	// we simulate another read event if there are still bytes
 	if ( socket->m_takesEvents )
 	{
-  		size_t sz = 0 ;
+  		OTByteCount sz = 0 ;
   		OTCountDataBytes( socket->m_endpoint , &sz ) ;
   		if ( sz > 0 )
   		{
@@ -1350,7 +1373,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   assert(address != NULL); 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
 
-  OTInetAddressToName( gInetSvcRef , address->m_host , &name ) ;
+  OTInetAddressToName( gInetSvcRef , address->m_host , name ) ;
   strncpy( hostname , name , sbuf ) ;
   return GSOCK_NOERROR;
 }
@@ -1382,7 +1405,7 @@ void _GSocket_Enable_Events(GSocket *socket)
 	  state = OTGetEndpointState(socket->m_endpoint);
 	  
 	  {
-	  	size_t sz = 0 ;
+	  	OTByteCount sz = 0 ;
 	  	OTCountDataBytes( socket->m_endpoint , &sz ) ;
 	  	if ( state == T_INCON || sz > 0 )
 	  	{
@@ -1422,7 +1445,7 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
     while( (now.hi * 4294967296.0 + now.lo) - (start.hi * 4294967296.0 + start.lo) < socket->m_timeout * 1000.0 )
     {
     	OTResult state ;
-   		size_t sz = 0 ;
+   		OTByteCount sz = 0 ;
  		state = OTGetEndpointState(socket->m_endpoint);
   
   		OTCountDataBytes( socket->m_endpoint , &sz ) ;
@@ -1590,4 +1613,13 @@ void _GSocket_Internal_Proc(unsigned long e , void* d )
 
 }
 
+/* Hack added for Mac OS X */
+GSocketError GAddress_UNIX_GetPath(GAddress *addr, char *path, size_t buf)
+{
+}
+
+GSocketError GAddress_UNIX_SetPath(GAddress *addr, const char *path)
+{
+}
+
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */