Merge of Mac OS X patch from Stéphane Corthésy (davelopper),

SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
Some of the proposed changes were already done by Rene Hexel's patch.


git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@213 119443c7-1b9e-41f8-b6fc-b9c35fce742c

ChangeLog

@@ -2,6 +2,11 @@
 Version 1.6.0
 *******************************************************************************
 
+2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Merge of Mac OS X patch from Stéphane Corthésy (davelopper),
+	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
+	Some of the proposed changes were already done by Rene Hexel's patch.
+
 2007-06-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* More fixes to Mac OS X and NetBSD from Rene Hexel:
 	[pupnp-devel] NetBSD & Mac OS X packages and patches

THANKS

@@ -31,6 +31,7 @@ exempt of errors.
 - Paul Vixie
 - Rene Hexel
 - Siva Chandran
+- Stéphane Corthésy
 - Timothy Redaelli
 - Titus Winters
 

threadutil/src/LinkedList.c

@@ -31,7 +31,7 @@
 
 #include "LinkedList.h"
 #include <sys/param.h>
-#if (defined(BSD) && BSD >= 199306)
+#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
 #include <stdlib.h>
 #else
 #include <malloc.h>

threadutil/src/ThreadPool.c

@@ -90,22 +90,23 @@ FreeThreadPoolJob( ThreadPool * tp,
 static int
 SetPolicyType( PolicyType in )
 {
-    #ifdef __CYGWIN__
+#ifdef __CYGWIN__
     /* TODO not currently working... */
     return 0;
-    #else
+#elif defined(__OSX__)
-    #ifdef WIN32
+    setpriority(PRIO_PROCESS, 0, 0);
+    return 0;
+#elif defined(WIN32)
      return sched_setscheduler( 0, in);
-    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
+#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
      struct sched_param current;
 
      sched_getparam( 0, &current );
      current.sched_priority = DEFAULT_SCHED_PARAM;
      return sched_setscheduler( 0, in, &current );
-    #else
+#else
      return 0;
-    #endif
+#endif
-    #endif
 }
 
 /****************************************************************************
@@ -364,7 +365,7 @@ static void SetSeed() {
 	ftime( &t );
 #if defined(WIN32)
 	srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id().p );
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OSX__)
 	srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id() );
 #elif defined(__linux__)
 	srand( ( unsigned int )t.millitm + ithread_get_current_thread_id() );

threadutil/src/iasnprintf.c

@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <sys/param.h>
-#if (defined(BSD) && BSD >= 199306)
+#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
 #include <stdlib.h>
 #else
 #include <malloc.h>

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

@@ -1362,7 +1362,7 @@ TvCtrlPointStart( print_string printFunctionPtr,
 
     ithread_mutex_init( &DeviceListMutex, 0 );
 
-    SampleUtil_Print( "Intializing UPnP with ipaddress=%s port=%d",
+    SampleUtil_Print( "Initializing UPnP with ipaddress=%s port=%d",
                       ip_address, port );
     rc = UpnpInit( ip_address, port );
     if( UPNP_E_SUCCESS != rc ) {

upnp/src/api/upnptools.c

@@ -36,7 +36,7 @@
 #include "uri.h"
 #define HEADER_LENGTH 2000
 
-//Structure to maintain a error code and string associated with the 
+// Structure to maintain a error code and string associated with the 
 // error code
 struct ErrorString {
     int rc;                     /* error code */
@@ -44,7 +44,7 @@ struct ErrorString {
 
 };
 
-//Intializing the array of error structures. 
+// Initializing the array of error structures. 
 struct ErrorString ErrorMessages[] = { {UPNP_E_SUCCESS, "UPNP_E_SUCCESS"},
 {UPNP_E_INVALID_HANDLE, "UPNP_E_INVALID_HANDLE"},
 {UPNP_E_INVALID_PARAM, "UPNP_E_INVALID_PARAM"},
@@ -581,4 +581,5 @@ UpnpCreatePropertySet( IN int NumArg,
     return PropSet;
 }
 
-#endif
+#endif // EXCLUDE_DOM == 0
+

upnp/src/genlib/net/uri/uri.c

@@ -555,7 +555,7 @@ parse_hostport( const char *in,
     int begin_port;
     int hostport_size = 0;
     int host_size = 0;
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__OSX__)
     char temp_hostbyname_buff[BUFFER_SIZE];
     struct hostent h_buf;
 #endif
@@ -626,27 +626,35 @@ parse_hostport( const char *in,
         // TODO: Use autoconf to discover this rather than the
         // platform-specific stuff below
 #if defined(WIN32) || defined(__CYGWIN__)
-        h=gethostbyname(temp_host_name);
+        h = gethostbyname(temp_host_name);
 #elif defined(SPARC_SOLARIS)
-        errCode = gethostbyname_r( temp_host_name,
+        errCode = gethostbyname_r(
+                temp_host_name,
                 &h,
                 temp_hostbyname_buff,
                 BUFFER_SIZE, &errcode );
 #elif defined(__FreeBSD__) && __FreeBSD_version < 601103
-        h = lwres_gethostbyname_r( temp_host_name,
+        h = lwres_gethostbyname_r(
+                temp_host_name,
                 &h_buf,
                 temp_hostbyname_buff,
                 BUFFER_SIZE, &errcode );
         if ( h == NULL ) {
                 errCode = 1;
         }
+#elif defined(__OSX__)
+        h = gethostbyname(temp_host_name);
+        if ( h == NULL ) {
+                errCode = 1;
+        }
 #elif defined(__linux__)
-        errCode = gethostbyname_r( temp_host_name,
+        errCode = gethostbyname_r(
+                temp_host_name,
                 &h_buf,
                 temp_hostbyname_buff,
                 BUFFER_SIZE, &h, &errcode );
 #else
-{
+        {
         struct addrinfo hints, *res, *res0;
 
         h = NULL;
@@ -671,9 +679,8 @@ parse_hostport( const char *in,
             }
             freeaddrinfo(res0);
         }
-}
+        }
 #endif 
-
         if( errCode == 0 ) {
             if( h ) {
                 if( ( h->h_addrtype == AF_INET ) && ( h->h_length == 4 ) ) {

upnp/test/test_init.c

@@ -105,7 +105,7 @@ main (int argc, char* argv[])
 	 * Test library initialisation
 	 */
 	printf ("\n");
-	printf ("Intializing UPnP ... \n");
+	printf ("Initializing UPnP ... \n");
 	rc = UpnpInit (NULL, 0);
 	if ( UPNP_E_SUCCESS == rc ) {
 		const char* ip_address = UpnpGetServerIpAddress();