* library/dde1.1/pkgIndex.tcl:

	* library/reg1.0/pkgIndex.tcl:
	* win/tclWinChan.c:
	* win/tclWinThrd.c: converted CRLF to LF the */tcl.hpj.in files
	were not converted, as it confuses hcw locally. [Bug: 5096]

	* win/Makefile.in: expanded cleanup or help files

	* doc/Thread.3: minor macro cleanup

10 files changed, 86 insertions, 70 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f6fcf2..62233eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-04-19  Jeff Hobbs  <hobbs@scriptics.com>
 
+	* library/dde1.1/pkgIndex.tcl:
+	* library/reg1.0/pkgIndex.tcl:
+	* win/tclWinChan.c:
+	* win/tclWinThrd.c: converted CRLF to LF the */tcl.hpj.in files
+	were not converted, as it confuses hcw locally. [Bug: 5096]
+
+	* win/Makefile.in: expanded cleanup or help files
+
+	* doc/Thread.3: minor macro cleanup
+
 	* generic/tclFileName.c (SplitUnixPath): added support for QNX
 	node ids.
 
diff --git a/doc/Thread.3 b/doc/Thread.3
index 3ba95b2..3f18471 100644
--- a/doc/Thread.3
+++ b/doc/Thread.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: Thread.3,v 1.9 2000/04/09 16:04:17 kupries Exp $
+'\" RCS: @(#) $Id: Thread.3,v 1.10 2000/04/20 01:30:19 hobbs Exp $
 '\" 
 .so man.macros
 .TH Threads 3 "8.1" Tcl "Tcl Library Procedures"
@@ -86,7 +86,7 @@ the same Tcl interpreter.  (However, as was the case in previous
 releases, a single thread can safely create and use multiple
 interpreters.)
 .PP
-.VB
+.VS 8.3.1
 Tcl does provide \fBTcl_CreateThread\fR for creating threads. The
 caller can determine the size of the stack given to the new thread and
 modify the behaviour through the supplied \fIflags\fR. The value
@@ -98,7 +98,7 @@ first of them invokes the default behaviour with no
 specialities. Using the second value marks the new thread as
 \fIjoinable\fR. This means that another thread can wait for the such
 marked thread to exit and join it.
-
+.PP
 Restrictions: On some unix systems the pthread-library does not
 contain the functionality to specify the stacksize of a thread. The
 specified value for the stacksize is ignored on these systems. Both
@@ -122,6 +122,7 @@ feature at this time, see the \fItclThreadTest.c\fR
 file in the Tcl source distribution for an experimental implementation
 of a Tcl "Thread" package implementing thread creation and management
 commands at the script level.
+
 .SH DESCRIPTION
 A mutex is a lock that is used to serialize all threads through a piece
 of code by calling \fBTcl_MutexLock\fR and \fBTcl_MutexUnlock\fR.
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index 17f09e9..f818736 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,5 +1,5 @@
-if {[info exists tcl_platform(debug)]} {

-    package ifneeded dde 1.1 [list load [file join $dir tcldde83d.dll] dde]

-} else {

-    package ifneeded dde 1.1 [list load [file join $dir tcldde83.dll] dde]

-}

+if {[info exists tcl_platform(debug)]} {
+    package ifneeded dde 1.1 [list load [file join $dir tcldde83d.dll] dde]
+} else {
+    package ifneeded dde 1.1 [list load [file join $dir tcldde83.dll] dde]
+}
diff --git a/library/dde1.1/pkgIndex.tcl b/library/dde1.1/pkgIndex.tcl
index 17f09e9..f818736 100644
--- a/library/dde1.1/pkgIndex.tcl
+++ b/library/dde1.1/pkgIndex.tcl
@@ -1,5 +1,5 @@
-if {[info exists tcl_platform(debug)]} {

-    package ifneeded dde 1.1 [list load [file join $dir tcldde83d.dll] dde]

-} else {

-    package ifneeded dde 1.1 [list load [file join $dir tcldde83.dll] dde]

-}

+if {[info exists tcl_platform(debug)]} {
+    package ifneeded dde 1.1 [list load [file join $dir tcldde83d.dll] dde]
+} else {
+    package ifneeded dde 1.1 [list load [file join $dir tcldde83.dll] dde]
+}
diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
index 5c2218c..d3e39dd 100755
--- a/library/reg/pkgIndex.tcl
+++ b/library/reg/pkgIndex.tcl
@@ -1,7 +1,7 @@
-if {[info exists tcl_platform(debug)]} {

-    package ifneeded registry 1.0 \

-            [list load [file join $dir tclreg83d.dll] registry]

-} else {

-    package ifneeded registry 1.0 \

-            [list load [file join $dir tclreg83.dll] registry]

-}

+if {[info exists tcl_platform(debug)]} {
+    package ifneeded registry 1.0 \
+            [list load [file join $dir tclreg83d.dll] registry]
+} else {
+    package ifneeded registry 1.0 \
+            [list load [file join $dir tclreg83.dll] registry]
+}
diff --git a/library/reg1.0/pkgIndex.tcl b/library/reg1.0/pkgIndex.tcl
index 5c2218c..d3e39dd 100755
--- a/library/reg1.0/pkgIndex.tcl
+++ b/library/reg1.0/pkgIndex.tcl
@@ -1,7 +1,7 @@
-if {[info exists tcl_platform(debug)]} {

-    package ifneeded registry 1.0 \

-            [list load [file join $dir tclreg83d.dll] registry]

-} else {

-    package ifneeded registry 1.0 \

-            [list load [file join $dir tclreg83.dll] registry]

-}

+if {[info exists tcl_platform(debug)]} {
+    package ifneeded registry 1.0 \
+            [list load [file join $dir tclreg83d.dll] registry]
+} else {
+    package ifneeded registry 1.0 \
+            [list load [file join $dir tclreg83.dll] registry]
+}
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 1393134..ecd115a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -6,41 +6,43 @@
 #
 #    HTML:		 1. Build the html target on Unix
 
-# RCS: @(#) $Id: Makefile.in,v 1.8 1999/05/22 01:20:14 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.9 2000/04/20 01:30:20 hobbs Exp $
 
-TCL = tcl@TCL_VERSION@
-TK = tk@TCL_VERSION@
-VER=@TCL_WIN_VERSION@
+TCL		= tcl@TCL_VERSION@
+TK		= tk@TCL_VERSION@
+VER		= @TCL_WIN_VERSION@
 
-TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_SOURCE = @TCL_SRC_DIR@
-TK_SOURCE = $(TCL_SOURCE)/../$(TK)
-PRO_SOURCE = $(TCL_SOURCE)/../pro
-ITCL_SOURCE = $(TCL_SOURCE)/../itcl3.0.1
+TCL_BIN_DIR	= @TCL_BIN_DIR@
+TCL_SOURCE	= @TCL_SRC_DIR@
+TK_SOURCE	= $(TCL_SOURCE)/../$(TK)
+PRO_SOURCE	= $(TCL_SOURCE)/../pro
+ITCL_SOURCE	= $(TCL_SOURCE)/../itcl3.1.0
 
-TCL_DOCS = \
-	$(TCL_SOURCE)/doc/*.[13n]
+TCL_DOCS	= $(TCL_SOURCE)/doc/*.[13n]
 
-TK_DOCS = \
-	$(TK_SOURCE)/doc/*.[13n]
+TK_DOCS		= $(TK_SOURCE)/doc/*.[13n]
 
-PRO_DOCS = \
+PRO_DOCS	= \
 	$(PRO_SOURCE)/doc/man/procheck.1 \
 	$(PRO_SOURCE)/doc/man/prodebug.1 \
 	$(PRO_SOURCE)/doc/man/prodebug.n \
 	$(PRO_SOURCE)/doc/man/prolicense.1
 
-ITCL_DOCS = \
+ITCL_DOCS	= \
 	$(ITCL_SOURCE)/itcl/doc/*.[13n] \
 	$(ITCL_SOURCE)/itk/doc/*.[13n]
 
 #	$(ITCL_SOURCE)/iwidgets3.0.0/doc/*.[13n]
 
-COREDOCS = $(TCL_DOCS) $(TK_DOCS) 
-#PRODOCS = $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS)
-PRODOCS = $(COREDOCS) $(PRO_DOCS) 
-TCLSH = $(TCL_BIN_DIR)/tclsh
-CC=@CC@
+COREDOCS	= $(TCL_DOCS) $(TK_DOCS) 
+#PRODOCS	= $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS)
+PRODOCS		= $(COREDOCS) $(PRO_DOCS) 
+TCLSH		= $(TCL_BIN_DIR)/tclsh
+CC		= @CC@
+
+#
+# Targets
+#
 
 all: core
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 9ef0363..80d8f93 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.31 2000/04/18 23:26:45 redman Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.32 2000/04/20 01:30:20 hobbs Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -511,14 +511,17 @@ depend:
 Makefile: Makefile.in
 	./config.status
 
-clean:
-	$(RM) *.lib *.exp *.dll *.${OBJEXT} *~ \#* TAGS a.out
-	$(RM) *.hlp *.cnt *.GID *.rtf
-	$(RM) $(TCLSH) $(TCLTEST) $(CAT32) man2tcl.exe
+cleanhelp:
+	$(RM) *.hlp *.cnt *.GID *.rtf man2tcl.exe
+
+clean: cleanhelp
+	$(RM) *.lib *.exp *.dll *.res *.${OBJEXT} *~ \#* TAGS a.out
+	$(RM) $(TCLSH) $(TCLTEST) $(CAT32)
 	$(RM) *.pch *.ilk *.pdb
 
 distclean: clean
-	$(RM) Makefile config.status config.cache config.log tclConfig.sh
+	$(RM) Makefile config.status config.cache config.log tclConfig.sh \
+		tcl.hpj
 
 #
 # Regenerate the stubs files.
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 28d7b51..70bf804 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinChan.c,v 1.9 1999/12/09 14:44:10 hobbs Exp $
+ * RCS: @(#) $Id: tclWinChan.c,v 1.10 2000/04/20 01:30:20 hobbs Exp $
  */
 
 #include "tclWinInt.h"
@@ -762,7 +762,7 @@ TclpOpenFileChannel(interp, fileName, modeString, permissions)
 	}
         TclWinConvertError(err);
 	if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "couldn't open \"", fileName, "\": ",

+            Tcl_AppendResult(interp, "couldn't open \"", fileName, "\": ",
 			     Tcl_PosixError(interp), (char *) NULL);
         }
         Tcl_DStringFree(&buffer);
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index e3227b1..8fe2596 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinThrd.c,v 1.7 2000/04/17 20:32:26 welch Exp $
+ * RCS: @(#) $Id: tclWinThrd.c,v 1.8 2000/04/20 01:30:20 hobbs Exp $
  */
 
 #include "tclWinInt.h"
@@ -42,7 +42,7 @@ static CRITICAL_SECTION initLock;
  */
 
 static CRITICAL_SECTION allocLock;
-static Tcl_Mutex allocLockPtr = (Tcl_Mutex) &allocLock;

+static Tcl_Mutex allocLockPtr = (Tcl_Mutex) &allocLock;
 
 /*
  * Condition variables are implemented with a combination of a 
@@ -203,17 +203,17 @@ Tcl_GetCurrentThread()
 void
 TclpInitLock()
 {
-    if (!init) {

-	/*

-	 * There is a fundamental race here that is solved by creating

-	 * the first Tcl interpreter in a single threaded environment.

-	 * Once the interpreter has been created, it is safe to create

-	 * more threads that create interpreters in parallel.

-	 */

-	init = 1;

-	InitializeCriticalSection(&initLock);

-	InitializeCriticalSection(&masterLock);

-    }

+    if (!init) {
+	/*
+	 * There is a fundamental race here that is solved by creating
+	 * the first Tcl interpreter in a single threaded environment.
+	 * Once the interpreter has been created, it is safe to create
+	 * more threads that create interpreters in parallel.
+	 */
+	init = 1;
+	InitializeCriticalSection(&initLock);
+	InitializeCriticalSection(&masterLock);
+    }
     EnterCriticalSection(&initLock);
 }
 
@@ -302,8 +302,8 @@ TclpMasterLock()
 Tcl_Mutex *
 Tcl_GetAllocMutex()
 {
-#ifdef TCL_THREADS

-    InitializeCriticalSection(&allocLock);

+#ifdef TCL_THREADS
+    InitializeCriticalSection(&allocLock);
     return &allocLockPtr;
 #else
     return NULL;