summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2004-10-30 18:03:55 (GMT)
committerKevin B Kenny <kennykb@acm.org>2004-10-30 18:03:55 (GMT)
commit130de37a3df4f7e6f1886bda7328efa0da2d66b8 (patch)
tree71250bd3b24852f221b14470eb37a4ca98bf8961
parentd90e8072f547d5c90ca14de82a3b9897afe7ed9a (diff)
downloadtcl-130de37a3df4f7e6f1886bda7328efa0da2d66b8.zip
tcl-130de37a3df4f7e6f1886bda7328efa0da2d66b8.tar.gz
tcl-130de37a3df4f7e6f1886bda7328efa0da2d66b8.tar.bz2
replaced WIN32 with __WIN32__ [Bug 1054357] (Gravereaux)
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclClock.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index add43e9..2d5ae2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-30 Kevin Kenny <kennykb@acm.org>
+
+ * generic/clock.c: Replaced WIN32 macro with __WIN32__.
+ [Bug 1054357]. Thanks to David Gravereaux for the patch.
+
2004-10-29 Don Porter <dgp@users.sourceforge.net>
* library/tcltest/tcltest.tcl: Correct reaction to errors in the
diff --git a/generic/tclClock.c b/generic/tclClock.c
index ff63767..6611576 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclClock.c,v 1.36 2004/10/29 15:39:05 dkf Exp $
+ * RCS: @(#) $Id: tclClock.c,v 1.37 2004/10/30 18:04:00 kennykb Exp $
*/
#include "tclInt.h"
@@ -21,7 +21,7 @@
* Windows has mktime. The configurators do not check.
*/
-#ifdef WIN32
+#ifdef __WIN32__
#define HAVE_MKTIME 1
#endif