source: branches/gsoc13-tests/src/thread2.6.diff @ 106692

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

props

File size: 2.6 KB
  • src/thread2.6

    diff -ru src/thread2.6/Makefile.in src/thread2.6.mine/Makefile.in
    old new  
    6767
    6868srcdir          = @srcdir@
    6969prefix          = @prefix@
    70 exec_prefix     = @exec_prefix@
     70exec_prefix     = @prefix@
    7171
    7272bindir          = @bindir@
    73 libdir          = @libdir@
     73libdir          = @prefix@/share/macports/Tcl
    7474datadir         = @datadir@
    75 mandir          = @mandir@
     75mandir          = @prefix@/share/macports/man
    7676includedir      = @includedir@
    7777
    7878DESTDIR         =
  • src/thread2.6

    diff -ru src/thread2.6/configure src/thread2.6.mine/configure
    old new  
    63746374   { (exit 1); exit 1; }; }
    63756375            fi
    63766376        else
    6377             # Check order: pkg --prefix location, Tcl's --prefix location,
     6377            # Check order:
    63786378            # directory of tclConfig.sh, and Tcl source directory.
    63796379            # Looking in the source dir is not ideal, but OK.
    63806380
    6381             eval "temp_includedir=${includedir}"
    6382             list="`ls -d ${temp_includedir}      2>/dev/null` \
    6383                 `ls -d ${TCL_PREFIX}/include     2>/dev/null` \
     6381            list="`ls -d ${TCL_PREFIX}/include     2>/dev/null` \
    63846382                `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null` \
    63856383                `ls -d ${TCL_SRC_DIR}/generic    2>/dev/null`"
    63866384            if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
  • lib/ttrace.tcl

    diff -ru src/thread2.6/lib/ttrace.tcl src/thread2.6.mine/lib/ttrace.tcl
    old new  
    5050        variable mutex ns_mutex
    5151        variable elock [$mutex create traceepochmutex]
    5252        variable store nsv_
    53     } elseif {![catch {package require Thread} version]} {
    54         variable tvers $version
     53    } elseif {![catch {package require Thread} thread_pkg_version]} {
     54        variable tvers $thread_pkg_version
    5555        variable mutex thread::mutex
    5656        variable elock [$mutex create]
    5757        variable store tsv::
  • src/thread2.6/generic/threadPoolCmd.c

    # tcl-64/tcl_ext/thread/thread.diff
    old new  
    17101710 *
    17111711 *----------------------------------------------------------------------
    17121712 */
     1713#ifdef __WIN32__
     1714#include <sys/timeb.h>
     1715#else
     1716#include <sys/time.h>
     1717#endif
    17131718static void
    17141719GetTime(timePtr)
    17151720    Tcl_Time *timePtr;
    17161721{
    17171722#ifdef __WIN32__
    1718 #include <sys/timeb.h>
    17191723    struct timeb tb;
    17201724    (void)ftime(&tb);
    17211725    timePtr->sec  = tb.time;
    17221726    timePtr->usec = tb.millitm * 1000;
    17231727#else
    1724 #include <sys/time.h>
    17251728    struct timeval tv;
    17261729    (void)gettimeofday(&tv, NULL);
    17271730    timePtr->sec  = tv.tv_sec;
Note: See TracBrowser for help on using the repository browser.