diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-06 21:03:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-06 21:03:12 (GMT) |
| commit | ba4f81fa636254a1a76a3bad764e3a7fbfc6d72d (patch) | |
| tree | f8c3edeed79659d5d9d7d26d1ad0d057139e78e3 | |
| parent | c621e8cf65ee82170eaf0241fd13e28751b82ee1 (diff) | |
| parent | 334981d2e58e7f00f9b074b89b22c8df5ae04d68 (diff) | |
| download | tcl-ba4f81fa636254a1a76a3bad764e3a7fbfc6d72d.zip tcl-ba4f81fa636254a1a76a3bad764e3a7fbfc6d72d.tar.gz tcl-ba4f81fa636254a1a76a3bad764e3a7fbfc6d72d.tar.bz2 | |
merge core-8-5-branch
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | generic/tclLoad.c | 6 | ||||
| -rw-r--r-- | generic/tclTest.c | 8 | ||||
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/tcl.m4 | 3 | ||||
| -rw-r--r-- | win/tclWinPort.h | 6 |
6 files changed, 30 insertions, 6 deletions
@@ -1,3 +1,13 @@ +2012-03-06 Jan Nijtmans <nijtmans@users.sf.net> + + * win/tclWinPort.h: Compatibility with older Visual Studio versions. + +2012-03-04 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tclLoad.c: Patch from the cygwin folks + * unix/tcl.m4: + * unix/configure: (re-generated) + 2012-02-29 Jan Nijtmans <nijtmans@users.sf.net> * generic/tclIOUtil.c: [Bug 3466099] BOM in Unicode diff --git a/generic/tclLoad.c b/generic/tclLoad.c index e64d0e0..ac863b9 100644 --- a/generic/tclLoad.c +++ b/generic/tclLoad.c @@ -308,6 +308,12 @@ Tcl_LoadObjCmd( && (pkgGuess[2] == 'b')) { pkgGuess += 3; } +#ifdef __CYGWIN__ + if ((pkgGuess[0] == 'c') && (pkgGuess[1] == 'y') + && (pkgGuess[2] == 'g')) { + pkgGuess += 3; + } +#endif /* __CYGWIN__ */ for (p = pkgGuess; *p != 0; p += offset) { offset = Tcl_UtfToUniChar(p, &ch); if ((ch > 0x100) diff --git a/generic/tclTest.c b/generic/tclTest.c index 9a288c5..c08f281 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -44,10 +44,6 @@ * Declare external functions used in Windows tests. */ -#if (defined( _MSC_VER )) -typedef void * intptr_t; -#endif - /* * Dynamic string shared by TestdcallCmd and DelCallbackProc; used to collect * the results of the various deletion callbacks. @@ -5353,7 +5349,7 @@ TestmainthreadCmd( const char **argv) /* Argument strings. */ { if (argc == 1) { - Tcl_Obj *idObj = Tcl_NewLongObj((long)(intptr_t)Tcl_GetCurrentThread()); + Tcl_Obj *idObj = Tcl_NewLongObj((long)(size_t)Tcl_GetCurrentThread()); Tcl_SetObjResult(interp, idObj); return TCL_OK; } else { @@ -6052,7 +6048,7 @@ TestChannelCmd( return TCL_ERROR; } - TclFormatInt(buf, (long)(intptr_t)Tcl_GetChannelThread(chan)); + TclFormatInt(buf, (long)(size_t)Tcl_GetChannelThread(chan)); Tcl_AppendResult(interp, buf, NULL); return TCL_OK; } diff --git a/unix/configure b/unix/configure index 2ba3d68..43c2d1c 100755 --- a/unix/configure +++ b/unix/configure @@ -6935,6 +6935,9 @@ fi DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" + TCL_NEEDS_EXP_FILE=1 + TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' + TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a' ;; dgux*) SHLIB_CFLAGS="-K PIC" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 78eacd9..37c7c74 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1245,6 +1245,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" + TCL_NEEDS_EXP_FILE=1 + TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' + TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a' ;; dgux*) SHLIB_CFLAGS="-K PIC" diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 4855d12..a29be86 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -19,6 +19,12 @@ # define _USE_32BIT_TIME_T #endif +/* Compatibility to older visual studio / windows platform SDK */ +#if !defined(MAXULONG_PTR) +typedef DWORD DWORD_PTR; +typedef DWORD_PTR * PDWORD_PTR; +#endif + #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN |