From 410c06cb4e036383c2c96d917e8d09b56b3425a8 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Wed, 4 Aug 2010 21:28:00 +0000
Subject:         * win/tclWin32Dll.c (TclWinInit): hard-enforce Windows 9x as
 an         unsupported platform with a panic.  Code to support it still      
   exists in other files (to go away in time), but new APIs are being        
 used that don't exist on Win9x.

---
 ChangeLog         |  5 +++++
 win/tclWin32Dll.c | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c87abd..aac1bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-04  Jeff Hobbs  <jeffh@ActiveState.com>
 
+	* win/tclWin32Dll.c (TclWinInit): hard-enforce Windows 9x as an
+	unsupported platform with a panic.  Code to support it still
+	exists in other files (to go away in time), but new APIs are being
+	used that don't exist on Win9x.
+
 	* unix/tclUnixFCmd.c: adjust license header as per
 	ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
 
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 45c9b83..6141e08 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWin32Dll.c,v 1.64 2010/08/04 19:35:22 hobbs Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.65 2010/08/04 21:28:00 hobbs Exp $
  */
 
 #include "tclWinInt.h"
@@ -390,13 +390,16 @@ TclWinInit(
     platformId = os.dwPlatformId;
 
     /*
-     * We no longer support Win32s, so just in case someone manages to get a
-     * runtime there, make sure they know that.
+     * We no longer support Win32s or Win9x, so just in case someone manages
+     * to get a runtime there, make sure they know that.
      */
 
     if (platformId == VER_PLATFORM_WIN32s) {
 	Tcl_Panic("Win32s is not a supported platform");
     }
+    if (platformId == VER_PLATFORM_WIN32_WINDOWS) {
+	Tcl_Panic("Windows 9x is not a supported platform");
+    }
 
     TclWinResetInterfaces();
 }
@@ -411,10 +414,10 @@ TclWinInit(
  *
  * Results:
  *	The return value is one of:
- *	    VER_PLATFORM_WIN32s		Win32s on Windows 3.1. (not supported)
- *	    VER_PLATFORM_WIN32_WINDOWS	Win32 on Windows 95, 98, ME.
- *	    VER_PLATFORM_WIN32_NT	Win32 on Windows NT, 2000, XP
- *	    VER_PLATFORM_WIN32_CE	Win32 on Windows CE
+ *	VER_PLATFORM_WIN32s	   Win32s on Windows 3.1 (not supported)
+ *	VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95, 98, ME (not supported)
+ *	VER_PLATFORM_WIN32_NT	Win32 on Windows NT, 2000, XP
+ *	VER_PLATFORM_WIN32_CE	Win32 on Windows CE
  *
  * Side effects:
  *	None.
-- 
cgit v0.12