source: trunk/base/src/thread2.6.diff @ 53280

Last change on this file since 53280 was 53280, checked in by jmr@…, 11 years ago

props

File size: 2.6 KB
RevLine 
[13464]1diff -ru src/thread2.6/Makefile.in src/thread2.6.mine/Makefile.in
[17537]2--- src/thread2.6/Makefile.in   Sat Dec 18 09:26:02 2004
3+++ src/thread2.6.mine/Makefile.in      Mon Apr 17 02:42:43 2006
4@@ -67,12 +67,12 @@
[13402]5 
[17537]6 srcdir         = @srcdir@
7 prefix         = @prefix@
8-exec_prefix    = @exec_prefix@
9+exec_prefix    = @prefix@
10 
[13402]11 bindir         = @bindir@
12-libdir         = @libdir@
[26177]13+libdir         = @prefix@/share/macports/Tcl
[13402]14 datadir                = @datadir@
15-mandir         = @mandir@
[26177]16+mandir         = @prefix@/share/macports/man
[13402]17 includedir     = @includedir@
18 
19 DESTDIR                =
[13464]20diff -ru src/thread2.6/configure src/thread2.6.mine/configure
[17537]21--- src/thread2.6/configure     Thu Dec 23 05:48:44 2004
22+++ src/thread2.6.mine/configure        Mon Apr 17 02:27:46 2006
[13464]23@@ -6374,13 +6374,11 @@
[13402]24    { (exit 1); exit 1; }; }
25            fi
26        else
27-           # Check order: pkg --prefix location, Tcl's --prefix location,
28+           # Check order:
29            # directory of tclConfig.sh, and Tcl source directory.
30            # Looking in the source dir is not ideal, but OK.
31 
32-           eval "temp_includedir=${includedir}"
33-           list="`ls -d ${temp_includedir}      2>/dev/null` \
34-               `ls -d ${TCL_PREFIX}/include     2>/dev/null` \
35+           list="`ls -d ${TCL_PREFIX}/include     2>/dev/null` \
36                `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null` \
37                `ls -d ${TCL_SRC_DIR}/generic    2>/dev/null`"
38            if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
[13464]39diff -ru src/thread2.6/lib/ttrace.tcl src/thread2.6.mine/lib/ttrace.tcl
[17537]40--- src/thread2.6/lib/ttrace.tcl        Fri Jul 30 01:37:50 2004
41+++ src/thread2.6.mine/lib/ttrace.tcl   Mon Apr 17 02:27:46 2006
[13464]42@@ -50,8 +50,8 @@
43         variable mutex ns_mutex
44         variable elock [$mutex create traceepochmutex]
45         variable store nsv_
46-    } elseif {![catch {package require Thread} version]} {
47-        variable tvers $version
48+    } elseif {![catch {package require Thread} thread_pkg_version]} {
49+        variable tvers $thread_pkg_version
50         variable mutex thread::mutex
51         variable elock [$mutex create]
52         variable store tsv::
[36723]53# tcl-64/tcl_ext/thread/thread.diff
54--- src/thread2.6/generic/threadPoolCmd.c.orig  2003-11-27 11:54:19.000000000 -0800
55+++ src/thread2.6/generic/threadPoolCmd.c       2005-07-20 23:10:12.000000000 -0700
56@@ -1710,18 +1710,21 @@
57  *
58  *----------------------------------------------------------------------
59  */
60+#ifdef __WIN32__
61+#include <sys/timeb.h>
62+#else
63+#include <sys/time.h>
64+#endif
65 static void
66 GetTime(timePtr)
67     Tcl_Time *timePtr;
68 {
69 #ifdef __WIN32__
70-#include <sys/timeb.h>
71     struct timeb tb;
72     (void)ftime(&tb);
73     timePtr->sec  = tb.time;
74     timePtr->usec = tb.millitm * 1000;
75 #else
76-#include <sys/time.h>
77     struct timeval tv;
78     (void)gettimeofday(&tv, NULL);
79     timePtr->sec  = tv.tv_sec;
Note: See TracBrowser for help on using the repository browser.