[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/upnp_s...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       13/07/07 10:52:11

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : upnp_stubs.c 

Log message:
        patch #7917

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1566&r2=1.1567
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/upnp_stubs.c?cvsroot=mldonkey&r1=1.2&r2=1.3

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1566
retrieving revision 1.1567
diff -u -b -r1.1566 -r1.1567
--- distrib/ChangeLog   5 Aug 2012 15:49:02 -0000       1.1566
+++ distrib/ChangeLog   7 Jul 2013 10:52:11 -0000       1.1567
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2013/07/07:
+7917: Allow upnp_stub.c to be compiled on Mac OS X (zbroyar)
+
 2012/08/05: version 3.1.3 = tag release-3-1-3
 
 2012/07/27

Index: src/utils/net/upnp_stubs.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/upnp_stubs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/utils/net/upnp_stubs.c  24 Jun 2012 08:10:42 -0000      1.2
+++ src/utils/net/upnp_stubs.c  7 Jul 2013 10:52:11 -0000       1.3
@@ -32,6 +32,7 @@
 
 #include <string.h>
 #include <ctype.h>
+#include <time.h>
 
 #ifdef __MORPHOS__
 #include <inttypes.h>
@@ -871,8 +872,22 @@
                if ( g_running ){
                        deltatime.tv_sec = time(NULL) + 30;
                        deltatime.tv_nsec = 0;
+#if defined(_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS - 200112L) >= 0L
                        err = pthread_mutex_timedlock(&g_delay_mutex, 
&deltatime);
                        dbg_printf("%d seconds timedlock err=%d, running...\n", 
deltatime.tv_sec, err);
+#else
+                       do {
+                               err = pthread_mutex_trylock(&g_delay_mutex);
+                               if(err == EBUSY){
+                                       struct timespec ts;
+                                       ts.tv_sec = 0;
+                                       ts.tv_nsec = 100000000;
+                                       int status = -1;
+                                       while (status == -1) status = 
nanosleep(&ts, &ts);
+                               } else break;
+                               //dbg_printf("trylock err=%d, running...\n", 
err);
+                       } while (err != 0 && (time(NULL) < deltatime.tv_sec));
+#endif
                }else{
                        break;
                }