summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-12-20 09:30:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-12-20 09:30:02 (GMT)
commit1c8b2b280f3d85688ac53e997df447281672a44a (patch)
treed84b517e050859f5635eef156f6869f152c3de2a /win
parentb8271467dc712230e7eecf2818f7232c2ebda8b4 (diff)
parent43b22f924faa4963e0238f2191f56270c8d90b81 (diff)
downloadtcl-1c8b2b280f3d85688ac53e997df447281672a44a.zip
tcl-1c8b2b280f3d85688ac53e997df447281672a44a.tar.gz
tcl-1c8b2b280f3d85688ac53e997df447281672a44a.tar.bz2
merge trunk (still has test failure in socket.test)
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index c10b196..d6de5e1 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -113,12 +113,12 @@ the build instructions.
# memdbg = Enables the debugging memory allocator.
#
# CHECKS=64bit,fullwarn,nodep,none
-# Sets special macros for checking compatability.
+# Sets special macros for checking compatibility.
#
# 64bit = Enable 64bit portability warnings (if available)
# fullwarn = Builds with full compiler and link warnings enabled.
# Very verbose.
-# nodep = Turns off compatability macros to ensure the core
+# nodep = Turns off compatibility macros to ensure the core
# isn't being built with deprecated functions.
#
# MACHINE=(ALPHA|AMD64|IA64|IX86)