[Python-checkins] r61608 - in external: tcl-8.4.18.x/generic/tcl.h tcl-8.4.18.x/win/makefile.vc tcl-8.4.18.x/win/nmakehlp.c tcl-8.4.18.x/win/sed.exe tcl-8.4.18.x/win/tclWinConsole.c tk-8.4.18.x/win/makefile.vc tk-8.4.18.x/win/nmakehlp.c

Wed Mar 19 08:08:04 CET 2008

Author: trent.nelson
Date: Wed Mar 19 08:08:04 2008
New Revision: 61608
Added:
 external/tcl-8.4.18.x/win/sed.exe
Modified:
 external/tcl-8.4.18.x/generic/tcl.h
 external/tcl-8.4.18.x/win/makefile.vc
 external/tcl-8.4.18.x/win/nmakehlp.c
 external/tcl-8.4.18.x/win/tclWinConsole.c
 external/tk-8.4.18.x/win/makefile.vc
 external/tk-8.4.18.x/win/nmakehlp.c
Log:
Fix tcl/tk 8.4.18 such that they build successfully w/ Visual Studio 2008 (both 32-bit and x64).
Modified: external/tcl-8.4.18.x/generic/tcl.h
==============================================================================

--- external/tcl-8.4.18.x/generic/tcl.h	(original)
+++ external/tcl-8.4.18.x/generic/tcl.h	Wed Mar 19 08:08:04 2008
@@ -67,6 +67,11 @@
 /*
 * The following definitions set up the proper options for Windows
 * compilers. We use this method because there is no autoconf equivalent.
+ * The need to stipulate bufferoverflowU.lib during linking depends on
+ * the version of the Microsoft compiler we're using. The pragma
+ * approach below is the recommended way of dealing with the issue by
+ * Microsoft. See the following URL for a relevant discussion:
+ * http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=72235&SiteID=1
 */
 
 #ifndef __WIN32__
@@ -75,6 +80,9 @@
 #	ifndef WIN32
 #	 define WIN32
 #	endif
+#	if _MSC_FULL_VER > 140000000 && _MSC_FULL_VER <= 140040310
+#	 pragma comment(lib, "bufferoverflowU")
+#	endif
 # endif
 #endif
 
@@ -383,7 +391,7 @@
 # define TCL_LL_MODIFIER	"L"
 # define TCL_LL_MODIFIER_SIZE	1
 # else /* __BORLANDC__ */
-# if _MSC_VER < 1400 || !defined(_M_IX86)
+# if _MSC_VER < 1400 && !defined(_M_IX86)
 typedef struct _stati64	Tcl_StatBuf;
 # else
 typedef struct _stat64 Tcl_StatBuf;
Modified: external/tcl-8.4.18.x/win/makefile.vc
==============================================================================
--- external/tcl-8.4.18.x/win/makefile.vc	(original)
+++ external/tcl-8.4.18.x/win/makefile.vc	Wed Mar 19 08:08:04 2008
@@ -403,11 +403,6 @@
 guilflags = $(lflags) -subsystem:windows
 
 baselibs = kernel32.lib advapi32.lib user32.lib
-# Avoid 'unresolved external symbol __security_cookie' errors.
-# c.f. http://support.microsoft.com/?id=894573
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-baselibs = $(baselibs) bufferoverflowU.lib
-!endif
 
 #---------------------------------------------------------------------
 # TclTest flags
Modified: external/tcl-8.4.18.x/win/nmakehlp.c
==============================================================================
--- external/tcl-8.4.18.x/win/nmakehlp.c	(original)
+++ external/tcl-8.4.18.x/win/nmakehlp.c	Wed Mar 19 08:08:04 2008
@@ -20,7 +20,7 @@
 #pragma comment (lib, "kernel32.lib")
 #include <stdio.h>
 #include <math.h>
-#if defined(_M_IA64) || defined(_M_AMD64)
+#if _MSC_FULL_VER > 140000000 && _MSC_FULL_VER <= 140040310
 #pragma comment(lib, "bufferoverflowU")
 #endif
 
Added: external/tcl-8.4.18.x/win/sed.exe
==============================================================================
--- (empty file)
+++ external/tcl-8.4.18.x/win/sed.exe	Wed Mar 19 08:08:04 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Object not found!</title>
+<link rev="made" href="mailto:support at onresolve.com" />
+<style type="text/css"><!--/*--><![CDATA[/*><!--*/ 
+ body { color: #000000; background-color: #FFFFFF; }
+ a:link { color: #0000CC; }
+ p, address {margin-left: 3em;}
+ span {font-size: smaller;}
+/*]]>*/--></style>
+</head>
+
+<body>
+<h1>Object not found!</h1>
+<p>
+
+
+ The requested URL was not found on this server.
+
+ 
+
+ The link on the
+ <a href="http://bugs.python.org/issue2296">referring
+ page</a> seems to be wrong or outdated. Please inform the author of
+ <a href="http://bugs.python.org/issue2296">that page</a>
+ about the error.
+
+ 
+
+</p>
+<p>
+If you think this is a server error, please contact
+the <a href="mailto:support at onresolve.com">webmaster</a>.
+
+</p>
+
+<h2>Error 404</h2>
+<address>
+ <a href="/">svn.onresolve.com</a><br />
+ 
+ <span>Tue Mar 18 12:07:40 2008<br />
+ Apache/2.2.4 (FreeBSD) mod_ssl/2.2.4 OpenSSL/0.9.7e-p1 DAV/2 SVN/1.4.3 proxy_html/2.5 PHP/5.2.3 with Suhosin-Patch mod_ftp/3.0.0-dev mod_wsgi/1.0 Python/2.4.4</span>
+</address>
+</body>
+</html>
+
Modified: external/tcl-8.4.18.x/win/tclWinConsole.c
==============================================================================
--- external/tcl-8.4.18.x/win/tclWinConsole.c	(original)
+++ external/tcl-8.4.18.x/win/tclWinConsole.c	Wed Mar 19 08:08:04 2008
@@ -706,7 +706,7 @@
 */
 
 if (ReadConsole(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &count,
-		 (LPOVERLAPPED) NULL) == TRUE) {
+		 (LPVOID) NULL) == TRUE) {
 	buf[count] = '0円';
 	return count;
 }
Modified: external/tk-8.4.18.x/win/makefile.vc
==============================================================================
--- external/tk-8.4.18.x/win/makefile.vc	(original)
+++ external/tk-8.4.18.x/win/makefile.vc	Wed Mar 19 08:08:04 2008
@@ -435,11 +435,6 @@
 guilflags = $(lflags) -subsystem:windows
 
 baselibs = kernel32.lib advapi32.lib user32.lib
-# Avoid 'unresolved external symbol __security_cookie' errors.
-# c.f. http://support.microsoft.com/?id=894573
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-baselibs = $(baselibs) bufferoverflowU.lib
-!endif
 guilibs	 = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
 
 
Modified: external/tk-8.4.18.x/win/nmakehlp.c
==============================================================================
--- external/tk-8.4.18.x/win/nmakehlp.c	(original)
+++ external/tk-8.4.18.x/win/nmakehlp.c	Wed Mar 19 08:08:04 2008
@@ -20,7 +20,7 @@
 #pragma comment (lib, "kernel32.lib")
 #include <stdio.h>
 #include <math.h>
-#if defined(_M_IA64) || defined(_M_AMD64)
+#if _MSC_FULL_VER > 140000000 && _MSC_FULL_VER <= 140040310
 #pragma comment(lib, "bufferoverflowU")
 #endif
 
