[Mldonkey-commits] mldonkey distrib/ChangeLog src/config/mingw/os_...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/15 11:32:51

Modified files:
        distrib        : ChangeLog 
        src/config/mingw: os_stubs_c.c 
        src/utils/lib  : stubs_c.c 

Log message:
        patch #5277

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.956&r2=1.957
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/config/mingw/os_stubs_c.c?cvsroot=mldonkey&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/stubs_c.c?cvsroot=mldonkey&r1=1.41&r2=1.42

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -b -r1.956 -r1.957
--- distrib/ChangeLog   12 Aug 2006 20:36:14 -0000      1.956
+++ distrib/ChangeLog   15 Aug 2006 11:32:50 -0000      1.957
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/08/15
+5277: MinGW: use new gettimeofday() from mingw-runtime-3.10 (Schlumpf)
+
 2006/08/12
 5298: Some internal changes moved from multiuser patch to CVS
 5285: GUI: Self-test en-/decoding only down to protocol 24 to solve

Index: src/config/mingw/os_stubs_c.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/config/mingw/os_stubs_c.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/config/mingw/os_stubs_c.c       24 Jul 2006 20:13:20 -0000      1.18
+++ src/config/mingw/os_stubs_c.c       15 Aug 2006 11:32:51 -0000      1.19
@@ -182,27 +182,6 @@
 /*******************************************************************
 
 
-                         gettimeofday
-
-
-*******************************************************************/
-
-//http://lists.gnu.org/archive/html/bug-gnu-chess/2004-01/msg00020.html
-void ml_gettimeofday(struct timeval* p, void* tz /* IGNORED */){
-   union {
-     long long ns100; /*time since 1 Jan 1601 in 100ns units */
-     FILETIME ft;
-   } _now;
-
-   GetSystemTimeAsFileTime( &(_now.ft) );
-   p->tv_usec=(long)((_now.ns100 / 10LL) % 1000000LL );
-   p->tv_sec= (long)((_now.ns100-(116444736000000000LL))/10000000LL);
-   return;
-}
-
-/*******************************************************************
-
-
                          os_uname
 
 

Index: src/utils/lib/stubs_c.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/stubs_c.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- src/utils/lib/stubs_c.c     29 Jul 2006 12:54:58 -0000      1.41
+++ src/utils/lib/stubs_c.c     15 Aug 2006 11:32:51 -0000      1.42
@@ -854,11 +854,7 @@
   pthread_mutex_lock(&mutex);
 
   while(1){
-#if defined(__MINGW32__)
-    ml_gettimeofday(&now, NULL);
-#else
     gettimeofday(&now, NULL);
-#endif
     timeout.tv_sec = now.tv_sec + 10;
     timeout.tv_nsec = now.tv_usec * 1000;