Merge local changes.

3 files changed, 25 insertions, 9 deletions

diff --git a/contrib/tcl/FREEBSD-upgrade b/contrib/tcl/FREEBSD-upgrade
index a2436d7..dbd5490 100644
--- a/contrib/tcl/FREEBSD-upgrade
+++ b/contrib/tcl/FREEBSD-upgrade
@@ -2,3 +2,11 @@ Tcl 7.5
 	originals can be found at: ftp://ftp.smli.com/pub/tcl 
 	removed subdirectories "win", "mac", "compat"
 	phk@FreeBSD.org
+
+Tcl 7.5 update 1
+	Imported with the commands:
+
+	tar zxvf tcl7.5p1.tar.gz
+	cd tcl7.5
+	rm -rf win mac compat
+	cvs import src/contrib/tcl TCL tcl7_5_p1
diff --git a/contrib/tcl/README.FreeBSD b/contrib/tcl/README.FreeBSD
index a2436d7..dbd5490 100644
--- a/contrib/tcl/README.FreeBSD
+++ b/contrib/tcl/README.FreeBSD
@@ -2,3 +2,11 @@ Tcl 7.5
 	originals can be found at: ftp://ftp.smli.com/pub/tcl 
 	removed subdirectories "win", "mac", "compat"
 	phk@FreeBSD.org
+
+Tcl 7.5 update 1
+	Imported with the commands:
+
+	tar zxvf tcl7.5p1.tar.gz
+	cd tcl7.5
+	rm -rf win mac compat
+	cvs import src/contrib/tcl TCL tcl7_5_p1
diff --git a/contrib/tcl/unix/tclUnixTime.c b/contrib/tcl/unix/tclUnixTime.c
index 80328af..21f1885 100644
--- a/contrib/tcl/unix/tclUnixTime.c
+++ b/contrib/tcl/unix/tclUnixTime.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.
  *
- * SCCS: @(#) tclUnixTime.c 1.10 96/02/15 11:58:41
+ * SCCS: @(#) tclUnixTime.c 1.11 96/07/23 16:17:21
  */
 
 #include "tclInt.h"
@@ -18,7 +18,7 @@
 /*
  *-----------------------------------------------------------------------------
  *
- * TclGetSeconds --
+ * TclpGetSeconds --
  *
  *	This procedure returns the number of seconds from the epoch.  On
  *	most Unix systems the epoch is Midnight Jan 1, 1970 GMT.
@@ -33,7 +33,7 @@
  */
 
 unsigned long
-TclGetSeconds()
+TclpGetSeconds()
 {
     return time((time_t *) NULL);
 }
@@ -41,7 +41,7 @@ TclGetSeconds()
 /*
  *-----------------------------------------------------------------------------
  *
- * TclGetClicks --
+ * TclpGetClicks --
  *
  *	This procedure returns a value that represents the highest resolution
  *	clock available on the system.  There are no garantees on what the
@@ -58,7 +58,7 @@ TclGetSeconds()
  */
 
 unsigned long
-TclGetClicks()
+TclpGetClicks()
 {
     unsigned long now;
 #ifdef NO_GETTOD
@@ -81,7 +81,7 @@ TclGetClicks()
 /*
  *----------------------------------------------------------------------
  *
- * TclGetTimeZone --
+ * TclpGetTimeZone --
  *
  *	Determines the current timezone.  The method varies wildly
  *	between different platform implementations, so its hidden in
@@ -97,7 +97,7 @@ TclGetClicks()
  */
 
 int
-TclGetTimeZone (currentTime)
+TclpGetTimeZone (currentTime)
     unsigned long  currentTime;
 {
     /*
@@ -190,7 +190,7 @@ TclGetTimeZone (currentTime)
 /*
  *----------------------------------------------------------------------
  *
- * TclGetTime --
+ * TclpGetTime --
  *
  *	Gets the current system time in seconds and microseconds
  *	since the beginning of the epoch: 00:00 UCT, January 1, 1970.
@@ -205,7 +205,7 @@ TclGetTimeZone (currentTime)
  */
 
 void
-TclGetTime(timePtr)
+TclpGetTime(timePtr)
     Tcl_Time *timePtr;		/* Location to store time information. */
 {
     struct timeval tv;