summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--unix/tkUnixEvent.c6
-rw-r--r--unix/tkUnixWm.c5
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fb783d3..7ad69b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-31 Joe English <jenglish@users.sourceforge.net>
+ * unix/tkUnixWm.c, unix/tkUnixEvent.c: Replaced
+ TclpGetTime() with Tcl_GetTime(), to remove dependency
+ on tclInt.h [Bug 874745].
+
2003-01-27 Daniel Steffen <das@users.sourceforge.net>
* generic/tkTextIndex.c: added '#include <tclInt.h>' since the
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index b76130e..0a42ccb 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.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: tkUnixEvent.c,v 1.14 2004/01/13 02:06:01 davygrvy Exp $
+ * RCS: @(#) $Id: tkUnixEvent.c,v 1.15 2004/01/31 20:27:52 jenglish Exp $
*/
#include "tkInt.h"
@@ -470,7 +470,7 @@ TkUnixDoOneXEvent(timePtr)
*/
if (timePtr) {
- TclpGetTime(&now);
+ Tcl_GetTime(&now);
blockTime.tv_sec = timePtr->sec;
blockTime.tv_usec = timePtr->usec - now.usec;
if (blockTime.tv_usec < 0) {
@@ -543,7 +543,7 @@ TkUnixDoOneXEvent(timePtr)
*/
if (timePtr) {
- TclpGetTime(&now);
+ Tcl_GetTime(&now);
if ((now.sec > timePtr->sec) || ((now.sec == timePtr->sec)
&& (now.usec > timePtr->usec))) {
return 0;
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index ea414c6..b52b439 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -12,13 +12,12 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixWm.c,v 1.39 2004/01/13 02:06:01 davygrvy Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.40 2004/01/31 20:27:52 jenglish Exp $
*/
#include "tkPort.h"
#include "tkInt.h"
#include "tkUnixInt.h"
-#include <errno.h>
/*
* A data structure of the following type holds information for
@@ -4425,7 +4424,7 @@ WaitForEvent(display, wmInfoPtr, type, eventPtr)
oldRestrictProc = Tk_RestrictEvents(WaitRestrictProc, (ClientData) &info,
&oldRestrictData);
- TclpGetTime(&timeout);
+ Tcl_GetTime(&timeout);
timeout.sec += 2;
while (!info.foundEvent) {